0.0.10

adding the resultcode to the output
Merge pull request #167 from smack0007/manifest-path
2026-02-08 05:37:09 +00:00 · 2018-12-05 22:40:06 +01:00 · 2018-09-27 22:48:54 +02:00 · 2018-09-26 22:46:39 +02:00 · 2018-09-26 22:32:07 +02:00 · 2018-09-26 01:31:53 +02:00
71 changed files with 1860 additions and 877 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: csharp
 mono: none
-dotnet: 2.0.0
+dotnet: 2.1.300
 before_script:
+  - export PATH="$PATH:/home/travis/.dotnet/tools"
  - npm install electron-packager --global
 script:
-  - ./buildAll.sh
+  - ./buildAll.sh
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,36 @@
 # not release

+# 0.0.10
+
+ElectronNET.API:
+
+* manifestJsonFilePath fixed (thanks @smack0007)
+* Use Electron release 2.0.2 and updated packages (thanks @deinok)
+* fixes for Socket interaction (thanks @mojinxun)
+* Fixing SingleInstances (thanks @yaofeng)
+* Enhance WebContent.GetUrl (thanks @ru-sh)
+
+ElectronNET.CLI:
+
+* Show Resultcode for better debugging when using Build/Start Command
+* ElectronNET.CLI is now a global dotnet tool
+
+# 0.0.9
+
+ElectronNET.API:
+
+* Better Async handling - thanks @danielmarbach
+
+ElectronNET.CLI:
+
+* More options on the 'build' command, e.g. for a 32bit debug build with electron prune: build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32  /electron-params "--prune=true "
+* .NET Core project is now build with Release configuration, but can be adjusted with the new params.
+* Be aware: "Breaking" (but because of the alpha status of this project, we won't use SemVer)
+
+# 0.0.8
+
+This version was skipped because we unfortunatly released a pre version of this on NuGet.
+
 # 0.0.7

 ElectronNET.CLI:
--- a/ElectronNET.API/App.cs
+++ b/ElectronNET.API/App.cs
--- a/ElectronNET.API/Dialog.cs
+++ b/ElectronNET.API/Dialog.cs
@@ -3,7 +3,9 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Web;

 namespace ElectronNET.API
 {
@@ -47,18 +49,26 @@ namespace ElectronNET.API
        public Task<string[]> ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialogOptions options)
        {
            var taskCompletionSource = new TaskCompletionSource<string[]>();
+            string guid = Guid.NewGuid().ToString();

-            BridgeConnector.Socket.On("showOpenDialogComplete", (filePaths) =>
+            BridgeConnector.Socket.On("showOpenDialogComplete" + guid, (filePaths) =>
            {
-                BridgeConnector.Socket.Off("showOpenDialogComplete");
+                BridgeConnector.Socket.Off("showOpenDialogComplete" + guid);

                var result = ((JArray)filePaths).ToObject<string[]>();
-                taskCompletionSource.SetResult(result);
+                var list = new List<string>();
+                foreach (var item in result)
+                {
+                    list.Add(HttpUtility.UrlDecode(item));
+                }
+                taskCompletionSource.SetResult(list.ToArray());
            });

-                BridgeConnector.Socket.Emit("showOpenDialog", 
-                JObject.FromObject(browserWindow, _jsonSerializer), 
-                JObject.FromObject(options, _jsonSerializer));
+
+            BridgeConnector.Socket.Emit("showOpenDialog",
+            JObject.FromObject(browserWindow, _jsonSerializer),
+            JObject.FromObject(options, _jsonSerializer),
+            guid);

            return taskCompletionSource.Task;
        }
@@ -72,17 +82,19 @@ namespace ElectronNET.API
        public Task<string> ShowSaveDialogAsync(BrowserWindow browserWindow, SaveDialogOptions options)
        {
            var taskCompletionSource = new TaskCompletionSource<string>();
+            string guid = Guid.NewGuid().ToString();

-            BridgeConnector.Socket.On("showSaveDialogComplete", (filename) =>
+            BridgeConnector.Socket.On("showSaveDialogComplete" + guid, (filename) =>
            {
-                BridgeConnector.Socket.Off("showSaveDialogComplete");
+                BridgeConnector.Socket.Off("showSaveDialogComplete" + guid);

                taskCompletionSource.SetResult(filename.ToString());
            });

            BridgeConnector.Socket.Emit("showSaveDialog",
            JObject.FromObject(browserWindow, _jsonSerializer),
-            JObject.FromObject(options, _jsonSerializer));
+            JObject.FromObject(options, _jsonSerializer),
+            guid);

            return taskCompletionSource.Task;
        }
@@ -139,10 +151,11 @@ namespace ElectronNET.API
        public Task<MessageBoxResult> ShowMessageBoxAsync(BrowserWindow browserWindow, MessageBoxOptions messageBoxOptions)
        {
            var taskCompletionSource = new TaskCompletionSource<MessageBoxResult>();
+            var guid = Guid.NewGuid().ToString();

-            BridgeConnector.Socket.On("showMessageBoxComplete", (args) =>
+            BridgeConnector.Socket.On("showMessageBoxComplete" + guid, (args) =>
            {
-                BridgeConnector.Socket.Off("showMessageBoxComplete");
+                BridgeConnector.Socket.Off("showMessageBoxComplete" + guid);

                var result = ((JArray)args);

@@ -156,12 +169,13 @@ namespace ElectronNET.API

            if (browserWindow == null)
            {
-                BridgeConnector.Socket.Emit("showMessageBox", JObject.FromObject(messageBoxOptions, _jsonSerializer));
+                BridgeConnector.Socket.Emit("showMessageBox", JObject.FromObject(messageBoxOptions, _jsonSerializer), guid);
            } else
            {
                BridgeConnector.Socket.Emit("showMessageBox", 
                    JObject.FromObject(browserWindow, _jsonSerializer),
-                    JObject.FromObject(messageBoxOptions, _jsonSerializer));
+                    JObject.FromObject(messageBoxOptions, _jsonSerializer),
+                    guid);
            }

            return taskCompletionSource.Task;
@@ -205,16 +219,18 @@ namespace ElectronNET.API
        public Task ShowCertificateTrustDialogAsync(BrowserWindow browserWindow, CertificateTrustDialogOptions options)
        {
            var taskCompletionSource = new TaskCompletionSource<object>();
+            string guid = Guid.NewGuid().ToString();

-            BridgeConnector.Socket.On("showCertificateTrustDialogComplete", () =>
+            BridgeConnector.Socket.On("showCertificateTrustDialogComplete" + guid, () =>
            {
-                BridgeConnector.Socket.Off("showCertificateTrustDialogComplete");
+                BridgeConnector.Socket.Off("showCertificateTrustDialogComplete" + guid);
                taskCompletionSource.SetResult(null);
            });

            BridgeConnector.Socket.Emit("showCertificateTrustDialog",
                JObject.FromObject(browserWindow, _jsonSerializer),
-                JObject.FromObject(options, _jsonSerializer));
+                JObject.FromObject(options, _jsonSerializer),
+                guid);

            return taskCompletionSource.Task;
        }
--- a/ElectronNET.API/ElectronNET.API.csproj
+++ b/ElectronNET.API/ElectronNET.API.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <PackageOutputPath>..\artifacts</PackageOutputPath>
    <PackageId>ElectronNET.API</PackageId>
@@ -16,6 +16,7 @@ This package contains the API to access the "native" electron API.</Description>
    <PackageTags>electron aspnetcore</PackageTags>
    <PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
    <PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
+    <Version>1.0.0.2</Version>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -28,18 +29,18 @@ This package contains the API to access the "native" electron API.</Description>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <DocumentationFile>bin\Debug\netcoreapp2.0\ElectronNET.API.xml</DocumentationFile>
+    <Optimize>true</Optimize>
  </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
-    <PackageReference Include="SocketIoClientDotNet" Version="1.0.3" />
-  </ItemGroup>
-
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
    <Exec Command="$(ProjectDir)devCleanup.cmd" IgnoreExitCode="true" />
  </Target>
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
    <Exec Command="$(ProjectDir)devCleanup.sh" IgnoreExitCode="true" />
  </Target>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
+    <PackageReference Include="SocketIoClientDotNet" Version="1.0.5" />
+  </ItemGroup>

 </Project>
--- a/ElectronNET.API/Entities/HighlightMode.cs
+++ b/ElectronNET.API/Entities/HighlightMode.cs
@@ -18,6 +18,16 @@
        /// <summary>
        /// Never highlight the tray icon.
        /// </summary>
-        never
+        never,
+
+        /// <summary>
+        /// Activate highlight the tray icon.
+        /// </summary>
+        on,
+
+        /// <summary>
+        /// Deactivate highlight the tray icon.
+        /// </summary>
+        off
    }
 }
--- a/ElectronNET.API/Entities/LoadURLOptions.cs
+++ b/ElectronNET.API/Entities/LoadURLOptions.cs
@@ -1,4 +1,6 @@
-namespace ElectronNET.API.Entities
+using System.Collections.Generic;
+
+namespace ElectronNET.API.Entities
 {
    /// <summary>
    /// 
@@ -21,5 +23,10 @@
        /// files.
        /// </summary>
        public string BaseURLForDataURL { get; set; }
+
+        /// <summary>
+        /// Extra headers for the request.
+        /// </summary>
+        public string ExtraHeaders { get; set; }
    }
 }
--- a/ElectronNET.API/Entities/WebPreferences.cs
+++ b/ElectronNET.API/Entities/WebPreferences.cs
@@ -126,7 +126,7 @@ namespace ElectronNET.API.Entities
        /// A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to
        /// enable.The full list of supported feature strings can be found in the file.
        /// </summary>
-        public string BlinkFeatures { get; set; }
+        public string EnableBlinkFeatures { get; set; }

        /// <summary>
        /// A list of feature strings separated by ,, like CSSVariables,KeyboardEventKey to
--- a/ElectronNET.API/IpcMain.cs
+++ b/ElectronNET.API/IpcMain.cs
@@ -46,6 +46,7 @@ namespace ElectronNET.API
        public void On(string channel, Action<object> listener)
        {
            BridgeConnector.Socket.Emit("registerIpcMainChannel", channel);
+            BridgeConnector.Socket.Off(channel);
            BridgeConnector.Socket.On(channel, (args) => 
            {
                List<object> objectArray = FormatArguments(args);
--- a/ElectronNET.API/QuitEventArgs.cs
+++ b/ElectronNET.API/QuitEventArgs.cs
@@ -0,0 +1,16 @@
+namespace ElectronNET.API
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public sealed class QuitEventArgs
+    {
+        /// <summary>
+        /// Will prevent the default behaviour, which is terminating the application.
+        /// </summary>
+        public void PreventDefault()
+        {
+            Electron.App.PreventQuit();
+        }
+    }
+}
--- a/ElectronNET.API/WebContents.cs
+++ b/ElectronNET.API/WebContents.cs
@@ -132,6 +132,22 @@ namespace ElectronNET.API
            return taskCompletionSource.Task;
        }

+        public Task<string> GetUrl()
+        {
+            var taskCompletionSource = new TaskCompletionSource<string>();
+
+            var eventString = "webContents-getUrl" + Id;
+            BridgeConnector.Socket.On(eventString, (url) =>
+            {
+                BridgeConnector.Socket.Off(eventString);
+                taskCompletionSource.SetResult((string)url);
+            });
+
+            BridgeConnector.Socket.Emit("webContents-getUrl", Id);
+
+            return taskCompletionSource.Task;
+        }
+        
        private JsonSerializer _jsonSerializer = new JsonSerializer()
        {
            ContractResolver = new CamelCasePropertyNamesContractResolver(),
--- a/ElectronNET.API/WindowManager.cs
+++ b/ElectronNET.API/WindowManager.cs
@@ -38,6 +38,23 @@ namespace ElectronNET.API
            }
        }

+        /// <summary>
+        /// Quit when all windows are closed. (Default is true)
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if [quit window all closed]; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsQuitOnWindowAllClosed
+        {
+            get { return _isQuitOnWindowAllClosed; }
+            set
+            {
+                BridgeConnector.Socket.Emit("quit-app-window-all-closed-event", value);
+                _isQuitOnWindowAllClosed = value;
+            }
+        }
+        private bool _isQuitOnWindowAllClosed = true;
+
        /// <summary>
        /// Gets the browser windows.
        /// </summary>
--- a/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs
+++ b/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs
@@ -9,13 +9,12 @@ namespace ElectronNET.CLI.Commands.Actions
    {
        public struct GetTargetPlatformInformationResult
        {
-            public string DesiredPlatform { get; set; }
            public string NetCorePublishRid { get; set; }
            public string ElectronPackerPlatform { get; set; }

        }

-        public static GetTargetPlatformInformationResult Do(string desiredPlatform)
+        public static GetTargetPlatformInformationResult Do(string desiredPlatform, string specifiedPlatfromFromCustom)
        {
            string netCorePublishRid = string.Empty;
            string electronPackerPlatform = string.Empty;
@@ -34,22 +33,28 @@ namespace ElectronNET.CLI.Commands.Actions
                    netCorePublishRid = "linux-x64";
                    electronPackerPlatform = "linux";
                    break;
+                case "linux-arm":
+                    netCorePublishRid = "linux-arm";
+                    electronPackerPlatform = "linux";
+                    break;
+                case "custom":
+                    var splittedSpecified = specifiedPlatfromFromCustom.Split(';');
+                    netCorePublishRid = splittedSpecified[0];
+                    electronPackerPlatform = splittedSpecified[1];
+                    break;
                default:
                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                    {
-                        desiredPlatform = "win";
                        netCorePublishRid = "win-x64";
                        electronPackerPlatform = "win32";
                    }
                    if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                    {
-                        desiredPlatform = "osx";
                        netCorePublishRid = "osx-x64";
                        electronPackerPlatform = "darwin";
                    }
                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                    {
-                        desiredPlatform = "linux";
                        netCorePublishRid = "linux-x64";
                        electronPackerPlatform = "linux";
                    }
@@ -59,7 +64,6 @@ namespace ElectronNET.CLI.Commands.Actions

            return new GetTargetPlatformInformationResult()
            {
-                DesiredPlatform = desiredPlatform,
                ElectronPackerPlatform = electronPackerPlatform,
                NetCorePublishRid = netCorePublishRid
            };
--- a/ElectronNET.CLI/Commands/BuildCommand.cs
+++ b/ElectronNET.CLI/Commands/BuildCommand.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading.Tasks;
 using ElectronNET.CLI.Commands.Actions;

@@ -11,7 +13,14 @@ namespace ElectronNET.CLI.Commands
    {
        public const string COMMAND_NAME = "build";
        public const string COMMAND_DESCRIPTION = "Build your Electron Application.";
-        public const string COMMAND_ARGUMENTS = "<Platform> to build (default is current OS, possible values are: win,osx,linux)";
+        public static string COMMAND_ARGUMENTS = "Needed: '/target' with params 'win/osx/linux' to build for a typical app or use 'custom' and specify .NET Core build config & electron build config" + Environment.NewLine +
+                                                 " for custom target, check .NET Core RID Catalog and Electron build target/" + Environment.NewLine +
+                                                 " e.g. '/target win' or '/target custom \"win7-x86;win32\"'" + Environment.NewLine +
+                                                 "Optional: '/dotnet-configuration' with the desired .NET Core build config e.g. release or debug. Default = Release" + Environment.NewLine + 
+                                                 "Optional: '/electron-arch' to specify the resulting electron processor architecture (e.g. ia86 for x86 builds). Be aware to use the '/target custom' param as well!" + Environment.NewLine +
+                                                 "Optional: '/electron-params' specify any other valid parameter, which will be routed to the electron-packager." + Environment.NewLine +
+                                                 "Full example for a 32bit debug build with electron prune: build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32  /electron-params \"--prune=true \"";
+
        public static IList<CommandOption> CommandOptions { get; set; } = new List<CommandOption>();

        private string[] _args;
@@ -21,20 +30,36 @@ namespace ElectronNET.CLI.Commands
            _args = args;
        }

+        private string _paramTarget = "target";
+        private string _paramDotNetConfig = "dotnet-configuration";
+        private string _paramElectronArch = "electron-arch";
+        private string _paramElectronParams = "electron-params";
+
        public Task<bool> ExecuteAsync()
        {
            return Task.Run(() =>
            {
                Console.WriteLine("Build Electron Application...");

-                string desiredPlatform = "";
+                SimpleCommandLineParser parser = new SimpleCommandLineParser();
+                parser.Parse(_args);

-                if (_args.Length > 0)
+                var desiredPlatform = parser.Arguments[_paramTarget][0];
+                string specifiedFromCustom = string.Empty;
+                if (desiredPlatform == "custom" && parser.Arguments[_paramTarget].Length > 1)
                {
-                    desiredPlatform = _args[0];
+                    specifiedFromCustom = parser.Arguments[_paramTarget][1];
                }

-                var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform);
+                string configuration = "Release";
+                if (parser.Arguments.ContainsKey(_paramDotNetConfig))
+                {
+                    configuration = parser.Arguments[_paramDotNetConfig][0];
+                }
+
+                var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform, specifiedFromCustom);
+
+                Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}...");


                string tempPath = Path.Combine(Directory.GetCurrentDirectory(), "obj", "desktop", desiredPlatform);
@@ -47,27 +72,44 @@ namespace ElectronNET.CLI.Commands

                string tempBinPath = Path.Combine(tempPath, "bin");

-                Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}...");
+                Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid} under {configuration}-Configuration...");

-                ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} --output \"{tempBinPath}\"", Directory.GetCurrentDirectory());
+                var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c {configuration} --output \"{tempBinPath}\"", Directory.GetCurrentDirectory());
+
+                if (resultCode != 0)
+                {
+                    Console.WriteLine("Error occurred during dotnet publish: " + resultCode);
+                    return false;
+                }

                DeployEmbeddedElectronFiles.Do(tempPath);

-                Console.WriteLine("Start npm install...");
-                ProcessHelper.CmdExecute("npm install", tempPath);
+                var checkForNodeModulesDirPath = Path.Combine(tempPath, "node_modules");

-                Console.WriteLine("Start npm install electron-packager...");
-
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (Directory.Exists(checkForNodeModulesDirPath) == false)
                {
-                    // Works proper on Windows... 
-                    ProcessHelper.CmdExecute("npm install electron-packager --global", tempPath);
+                    Console.WriteLine("node_modules missing in: " + checkForNodeModulesDirPath);
+
+                    Console.WriteLine("Start npm install...");
+                    ProcessHelper.CmdExecute("npm install --production", tempPath);
+
+                    Console.WriteLine("Start npm install electron-packager...");
+
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        // Works proper on Windows... 
+                        ProcessHelper.CmdExecute("npm install electron-packager --global", tempPath);
+                    }
+                    else
+                    {
+                        // ToDo: find another solution or document it proper
+                        // GH Issue https://github.com/electron-userland/electron-prebuilt/issues/48
+                        Console.WriteLine("Electron Packager - make sure you invoke 'sudo npm install electron-packager --global' at " + tempPath + " manually. Sry.");
+                    }
                }
                else
                {
-                    // ToDo: find another solution or document it proper
-                    // GH Issue https://github.com/electron-userland/electron-prebuilt/issues/48
-                    Console.WriteLine("Electron Packager - make sure you invoke 'sudo npm install electron-packager --global' at " + tempPath + " manually. Sry.");
+                    Console.WriteLine("Skip npm install, because node_modules directory exists in: " + checkForNodeModulesDirPath);
                }

                Console.WriteLine("Build Electron Desktop Application...");
@@ -76,8 +118,21 @@ namespace ElectronNET.CLI.Commands
                Console.WriteLine("Executing electron magic in this directory: " + buildPath);

                // ToDo: Need a solution for --asar support
+
+                string electronArch = "x64";
+                if (parser.Arguments.ContainsKey(_paramElectronArch))
+                {
+                    electronArch = parser.Arguments[_paramElectronArch][0];
+                }
+
+                string electronParams = "";
+                if (parser.Arguments.ContainsKey(_paramElectronParams))
+                {
+                    electronParams = parser.Arguments[_paramElectronParams][0];
+                }
+
                Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
-                ProcessHelper.CmdExecute($"electron-packager . --platform={platformInfo.ElectronPackerPlatform} --arch=x64 --out=\"{buildPath}\" --overwrite", tempPath);
+                ProcessHelper.CmdExecute($"electron-packager . --platform={platformInfo.ElectronPackerPlatform} --arch={electronArch} {electronParams} --out=\"{buildPath}\" --overwrite", tempPath);

                Console.WriteLine("... done");

--- a/ElectronNET.CLI/Commands/StartElectronCommand.cs
+++ b/ElectronNET.CLI/Commands/StartElectronCommand.cs
@@ -48,10 +48,16 @@ namespace ElectronNET.CLI.Commands
                    Directory.CreateDirectory(tempPath);
                }

-                var platformInfo = GetTargetPlatformInformation.Do(string.Empty);
+                var platformInfo = GetTargetPlatformInformation.Do(String.Empty, String.Empty);

                string tempBinPath = Path.Combine(tempPath, "bin");
-                ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} --output \"{tempBinPath}\"", aspCoreProjectPath);
+                var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} --output \"{tempBinPath}\"", aspCoreProjectPath);
+
+                if (resultCode != 0)
+                {
+                    Console.WriteLine("Error occurred during dotnet publish: " + resultCode);
+                    return false;
+                }

                DeployEmbeddedElectronFiles.Do(tempPath);

--- a/ElectronNET.CLI/ElectronNET.CLI.csproj
+++ b/ElectronNET.CLI/ElectronNET.CLI.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>dotnet-electronize</AssemblyName>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <AssemblyName>electronize</AssemblyName>
    
    <PackageType>DotnetCliTool</PackageType>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <PackageOutputPath>..\artifacts</PackageOutputPath>
    <PackageId>ElectronNET.CLI</PackageId>
-    <Version>1.0.0</Version>
+    <Version>1.0.4.2</Version>
    <Authors>Gregor Biswanger, Robert Muehsig</Authors>
    <Product>Electron.NET</Product>
    <Company />
@@ -21,6 +21,7 @@ This package contains the dotnet tooling to electronize your application.</Descr
    <PackageTags>electron aspnetcore</PackageTags>
    <PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
    <PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
+    <PackAsTool>true</PackAsTool>
  </PropertyGroup>

  <ItemGroup>
--- a/ElectronNET.CLI/ProcessHelper.cs
+++ b/ElectronNET.CLI/ProcessHelper.cs
@@ -6,7 +6,7 @@ namespace ElectronNET.CLI
 {
    public class ProcessHelper
    {
-        public static void CmdExecute(string command, string workingDirectoryPath, bool output = true, bool waitForExit = true)
+        public static int CmdExecute(string command, string workingDirectoryPath, bool output = true, bool waitForExit = true)
        {
            using (Process cmd = new Process())
            {
@@ -28,10 +28,50 @@ namespace ElectronNET.CLI
                cmd.StartInfo.CreateNoWindow = true;
                cmd.StartInfo.UseShellExecute = false;
                cmd.StartInfo.WorkingDirectory = workingDirectoryPath;
+
+                int returnCode = 0;
+
                if (output)
                {
-                    cmd.OutputDataReceived += (s, e) => Console.WriteLine(e.Data);
-                    cmd.ErrorDataReceived += (s, e) => Console.WriteLine(e.Data);
+                    cmd.OutputDataReceived += (s, e) =>
+                    {
+                        // (sometimes error messages are only visbile here)
+                        // poor mans solution, we just seek for the term 'error'
+
+                        // we can't just use cmd.ExitCode, because
+                        // we delegate it to cmd.exe, which runs fine
+                        // but we can catch any error here and return
+                        // 1 if something fails
+                        if (e != null && string.IsNullOrWhiteSpace(e.Data) == false)
+                        {
+                            if (e.Data.ToLowerInvariant().Contains("error"))
+                            {
+                                returnCode = 1;
+                            }
+
+                            Console.WriteLine(e.Data);
+                        }
+
+                    };
+                    cmd.ErrorDataReceived += (s, e) =>
+                    {
+                        // poor mans solution, we just seek for the term 'error'
+
+                        // we can't just use cmd.ExitCode, because
+                        // we delegate it to cmd.exe, which runs fine
+                        // but we can catch any error here and return
+                        // 1 if something fails
+                        if (e != null && string.IsNullOrWhiteSpace(e.Data) == false)
+                        {
+                            if (e.Data.ToLowerInvariant().Contains("error"))
+                            {
+                                returnCode = 1;
+                            }
+
+                            Console.WriteLine(e.Data);
+                        }
+
+                    };
                }

                cmd.Start();
@@ -46,6 +86,8 @@ namespace ElectronNET.CLI
                {
                    cmd.WaitForExit();
                }
+
+                return returnCode;
            }
        }
    }
--- a/ElectronNET.CLI/Program.cs
+++ b/ElectronNET.CLI/Program.cs
@@ -7,7 +7,6 @@ using System.Text;

 namespace ElectronNET.CLI
 {
- 
    class Program
    {
        static void Main(string[] args)
@@ -71,7 +70,7 @@ namespace ElectronNET.CLI
                sb.Append($" ({version})");
            }
            Console.WriteLine(sb.ToString());
-            Console.WriteLine("Project Home: https://github.com/GregorBiswanger/ElectronNET");
+            Console.WriteLine("Project Home: https://github.com/ElectronNET/Electron.NET");
            Console.WriteLine("\t");
        }

--- a/ElectronNET.CLI/SimpleCommandLineParser.cs
+++ b/ElectronNET.CLI/SimpleCommandLineParser.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+
+namespace ElectronNET.CLI
+{
+    public class SimpleCommandLineParser
+    {
+        public SimpleCommandLineParser()
+        {
+            Arguments = new Dictionary<string, string[]>();
+        }
+        public IDictionary<string, string[]> Arguments { get; private set; }
+        public void Parse(string[] args)
+        {
+            var currentName = "";
+            var values = new List<string>();
+            foreach (var arg in args)
+            {
+                if (arg.StartsWith("/"))
+                {
+                    if (currentName != "")
+                        Arguments[currentName] = values.ToArray();
+                    values.Clear();
+                    currentName = arg.Substring(1);
+                }
+                else if (currentName == "")
+                    Arguments[arg] = new string[0];
+                else
+                    values.Add(arg);
+            }
+            if (currentName != "")
+                Arguments[currentName] = values.ToArray();
+        }
+        public bool Contains(string name)
+        {
+            return Arguments.ContainsKey(name);
+        }
+    }
+}
--- a/ElectronNET.Host/.vscode/tasks.json
+++ b/ElectronNET.Host/.vscode/tasks.json
@@ -1,6 +1,4 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
    "version": "2.0.0",
    "tasks": [
        {
--- a/ElectronNET.Host/api/app.js
+++ b/ElectronNET.Host/api/app.js
@@ -1,26 +1,35 @@
 "use strict";
-exports.__esModule = true;
+var isQuitWindowAllClosed = true;
 module.exports = function (socket, app) {
+    // Quit when all windows are closed.
+    app.on('window-all-closed', function () {
+        // On macOS it is common for applications and their menu bar
+        // to stay active until the user quits explicitly with Cmd + Q
+        if (process.platform !== 'darwin' &&
+            isQuitWindowAllClosed) {
+            app.quit();
+        }
+    });
+    socket.on('quit-app-window-all-closed-event', function (quit) {
+        isQuitWindowAllClosed = quit;
+    });
    socket.on('register-app-window-all-closed-event', function (id) {
        app.on('window-all-closed', function () {
            socket.emit('app-window-all-closed' + id);
        });
    });
    socket.on('register-app-before-quit-event', function (id) {
-        app.on('before-quit', function () {
+        app.on('before-quit', function (event) {
+            event.preventDefault();
            socket.emit('app-before-quit' + id);
        });
    });
    socket.on('register-app-will-quit-event', function (id) {
-        app.on('will-quit', function () {
+        app.on('will-quit', function (event) {
+            event.preventDefault();
            socket.emit('app-will-quit' + id);
        });
    });
-    socket.on('register-app-quit-event', function (id) {
-        app.on('quit', function () {
-            socket.emit('app-quit' + id);
-        });
-    });
    socket.on('register-app-browser-window-blur-event', function (id) {
        app.on('browser-window-blur', function () {
            socket.emit('app-browser-window-blur' + id);
@@ -141,14 +150,15 @@ module.exports = function (socket, app) {
    socket.on('appSetJumpList', function (categories) {
        app.setJumpList(categories);
    });
-    socket.on('appMakeSingleInstance', function () {
-        var success = app.makeSingleInstance(function (args, workingDirectory) {
-            socket.emit('newInstanceOpened', [args, workingDirectory]);
+    socket.on('appRequestSingleInstanceLock', function () {
+        app.on('second-instance', function (args, workingDirectory) {
+            socket.emit('secondInstance', [args, workingDirectory]);
        });
-        socket.emit('appMakeSingleInstanceCompleted', success);
+        var success = app.requestSingleInstanceLock();
+        socket.emit('appRequestSingleInstanceLockCompleted', success);
    });
-    socket.on('appReleaseSingleInstance', function () {
-        app.releaseSingleInstance();
+    socket.on('appReleaseSingleInstanceLock', function () {
+        app.releaseSingleInstanceLock();
    });
    socket.on('appSetUserActivity', function (type, userInfo, webpageURL) {
        app.setUserActivity(type, userInfo, webpageURL);
@@ -170,9 +180,7 @@ module.exports = function (socket, app) {
        socket.emit('appGetAppMetricsCompleted', processMetrics);
    });
    socket.on('appGetGpuFeatureStatus', function () {
-        // TS Workaround - TS say getGpuFeatureStatus - but it is getGPUFeatureStatus
-        var x = app;
-        var gpuFeatureStatus = x.getGPUFeatureStatus();
+        var gpuFeatureStatus = app.getGPUFeatureStatus();
        socket.emit('appGetGpuFeatureStatusCompleted', gpuFeatureStatus);
    });
    socket.on('appSetBadgeCount', function (count) {
--- a/ElectronNET.Host/api/app.js.map
+++ b/ElectronNET.Host/api/app.js.map
--- a/ElectronNET.Host/api/app.ts
+++ b/ElectronNET.Host/api/app.ts
@@ -1,7 +1,22 @@
 import { nativeImage as NativeImage } from 'electron';
+let isQuitWindowAllClosed = true;
+
+export = (socket: SocketIO.Socket, app: Electron.App) => {
+
+    // Quit when all windows are closed.
+    app.on('window-all-closed', () => {
+        // On macOS it is common for applications and their menu bar
+        // to stay active until the user quits explicitly with Cmd + Q
+        if (process.platform !== 'darwin' &&
+            isQuitWindowAllClosed) {
+            app.quit();
+        }
+    });
+
+    socket.on('quit-app-window-all-closed-event', (quit) => {
+        isQuitWindowAllClosed = quit;
+    });

-module.exports = (socket: SocketIO.Server, app: Electron.App) => {
-    
    socket.on('register-app-window-all-closed-event', (id) => {
        app.on('window-all-closed', () => {
            socket.emit('app-window-all-closed' + id);
@@ -9,20 +24,18 @@ module.exports = (socket: SocketIO.Server, app: Electron.App) => {
    });

    socket.on('register-app-before-quit-event', (id) => {
-        app.on('before-quit', () => {
+        app.on('before-quit', (event) => {
+            event.preventDefault();
+
            socket.emit('app-before-quit' + id);
        });
    });

    socket.on('register-app-will-quit-event', (id) => {
-        app.on('will-quit', () => {
-            socket.emit('app-will-quit' + id);
-        });
-    });
+        app.on('will-quit', (event) => {
+            event.preventDefault();

-    socket.on('register-app-quit-event', (id) => {
-        app.on('quit', () => {
-            socket.emit('app-quit' + id);
+            socket.emit('app-will-quit' + id);
        });
    });

@@ -103,7 +116,7 @@ module.exports = (socket: SocketIO.Server, app: Electron.App) => {
    // }

    socket.on('appGetFileIcon', (path, options) => {
-        if(options) {
+        if (options) {
            app.getFileIcon(path, options, (error, nativeImage) => {
                socket.emit('appGetFileIconCompleted', [error, nativeImage]);
            });
@@ -174,15 +187,17 @@ module.exports = (socket: SocketIO.Server, app: Electron.App) => {
        app.setJumpList(categories);
    });

-    socket.on('appMakeSingleInstance', () => {
-        const success = app.makeSingleInstance((args, workingDirectory) => {
-            socket.emit('newInstanceOpened', [args, workingDirectory]);
+    socket.on('appRequestSingleInstanceLock', () => {
+        app.on('second-instance', (args, workingDirectory) => {
+            socket.emit('secondInstance', [args, workingDirectory]);
        });
-        socket.emit('appMakeSingleInstanceCompleted', success);
+
+        const success = app.requestSingleInstanceLock();
+        socket.emit('appRequestSingleInstanceLockCompleted', success);
    });

-    socket.on('appReleaseSingleInstance', () => {
-        app.releaseSingleInstance();
+    socket.on('appReleaseSingleInstanceLock', () => {
+        app.releaseSingleInstanceLock();
    });

    socket.on('appSetUserActivity', (type, userInfo, webpageURL) => {
@@ -210,9 +225,7 @@ module.exports = (socket: SocketIO.Server, app: Electron.App) => {
    });

    socket.on('appGetGpuFeatureStatus', () => {
-        // TS Workaround - TS say getGpuFeatureStatus - but it is getGPUFeatureStatus
-        let x = <any>app;
-        const gpuFeatureStatus = x.getGPUFeatureStatus();
+        const gpuFeatureStatus = app.getGPUFeatureStatus();
        socket.emit('appGetGpuFeatureStatusCompleted', gpuFeatureStatus);
    });

@@ -304,4 +317,4 @@ module.exports = (socket: SocketIO.Server, app: Electron.App) => {
    socket.on('appDockSetIcon', (image) => {
        app.dock.setIcon(image);
    });
-}
+};
--- a/ElectronNET.Host/api/browserWindows.js
+++ b/ElectronNET.Host/api/browserWindows.js
@@ -1,9 +1,9 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 var path = require('path');
 var windows = [];
-module.exports = function (socket) {
+var window, lastOptions;
+module.exports = function (socket, app) {
    socket.on('register-browserWindow-ready-to-show', function (id) {
        getWindowById(id).on('ready-to-show', function () {
            socket.emit('browserWindow-ready-to-show' + id);
@@ -155,7 +155,8 @@ module.exports = function (socket) {
        });
    });
    socket.on('createBrowserWindow', function (options, loadUrl) {
-        var window = new electron_1.BrowserWindow(options);
+        window = new electron_1.BrowserWindow(options);
+        lastOptions = options;
        window.on('closed', function (sender) {
            var _loop_1 = function () {
                windowItem = windows[index];
@@ -176,6 +177,13 @@ module.exports = function (socket) {
                _loop_1();
            }
        });
+        app.on('activate', function () {
+            // On macOS it's common to re-create a window in the app when the
+            // dock icon is clicked and there are no other windows open.
+            if (window === null && lastOptions) {
+                window = new electron_1.BrowserWindow(lastOptions);
+            }
+        });
        if (loadUrl) {
            window.loadURL(loadUrl);
        }
--- a/ElectronNET.Host/api/browserWindows.js.map
+++ b/ElectronNET.Host/api/browserWindows.js.map
--- a/ElectronNET.Host/api/browserWindows.ts
+++ b/ElectronNET.Host/api/browserWindows.ts
@@ -1,8 +1,9 @@
 import { BrowserWindow, Menu, nativeImage } from "electron";
 const path = require('path');
 const windows: Electron.BrowserWindow[] = []
+let window, lastOptions;

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket, app: Electron.App) => {

    socket.on('register-browserWindow-ready-to-show', (id) => {
        getWindowById(id).on('ready-to-show', () => {
@@ -135,13 +136,13 @@ module.exports = (socket: SocketIO.Server) => {
            socket.emit('browserWindow-leave-html-full-screen' + id);
        });
    });
-    
+
    socket.on('register-browserWindow-app-command', (id) => {
        getWindowById(id).on('app-command', (event, command) => {
            socket.emit('browserWindow-app-command' + id, command);
        });
    });
-    
+
    socket.on('register-browserWindow-scroll-touch-begin', (id) => {
        getWindowById(id).on('scroll-touch-begin', () => {
            socket.emit('browserWindow-scroll-touch-begin' + id);
@@ -185,7 +186,8 @@ module.exports = (socket: SocketIO.Server) => {
    });

    socket.on('createBrowserWindow', (options, loadUrl) => {
-        let window = new BrowserWindow(options);
+        window = new BrowserWindow(options);
+        lastOptions = options;

        window.on('closed', (sender) => {
            for (var index = 0; index < windows.length; index++) {
@@ -204,6 +206,14 @@ module.exports = (socket: SocketIO.Server) => {
            }
        });

+        app.on('activate', () => {
+            // On macOS it's common to re-create a window in the app when the
+            // dock icon is clicked and there are no other windows open.
+            if (window === null && lastOptions) {
+                window = new BrowserWindow(lastOptions);
+            }
+        });
+
        if (loadUrl) {
            window.loadURL(loadUrl);
        }
@@ -367,119 +377,119 @@ module.exports = (socket: SocketIO.Server) => {
    socket.on('browserWindowSetMaximumSize', (id, width, height) => {
        getWindowById(id).setMaximumSize(width, height);
    });
-    
+
    socket.on('browserWindowGetMaximumSize', (id) => {
        const size = getWindowById(id).getMaximumSize();
-        
+
        socket.emit('browserWindow-getMaximumSize-completed', size);
    });
-    
+
    socket.on('browserWindowSetResizable', (id, resizable) => {
        getWindowById(id).setResizable(resizable);
    });
-    
+
    socket.on('browserWindowIsResizable', (id) => {
        const resizable = getWindowById(id).isResizable();
-        
+
        socket.emit('browserWindow-isResizable-completed', resizable);
    });
-    
+
    socket.on('browserWindowSetMovable', (id, movable) => {
        getWindowById(id).setMovable(movable);
    });
-    
+
    socket.on('browserWindowIsMovable', (id) => {
        const movable = getWindowById(id).isMovable();
-        
+
        socket.emit('browserWindow-isMovable-completed', movable);
    });
-    
+
    socket.on('browserWindowSetMinimizable', (id, minimizable) => {
        getWindowById(id).setMinimizable(minimizable);
    });
-    
+
    socket.on('browserWindowIsMinimizable', (id) => {
        const minimizable = getWindowById(id).isMinimizable();
-        
+
        socket.emit('browserWindow-isMinimizable-completed', minimizable);
    });
-    
+
    socket.on('browserWindowSetMaximizable', (id, maximizable) => {
        getWindowById(id).setMaximizable(maximizable);
    });
-    
+
    socket.on('browserWindowIsMaximizable', (id) => {
        const maximizable = getWindowById(id).isMaximizable();
-        
+
        socket.emit('browserWindow-isMaximizable-completed', maximizable);
    });
-    
+
    socket.on('browserWindowSetFullScreenable', (id, fullscreenable) => {
        getWindowById(id).setFullScreenable(fullscreenable);
    });
-    
+
    socket.on('browserWindowIsFullScreenable', (id) => {
        const fullscreenable = getWindowById(id).isFullScreenable();
-        
+
        socket.emit('browserWindow-isFullScreenable-completed', fullscreenable);
    });

    socket.on('browserWindowSetClosable', (id, closable) => {
        getWindowById(id).setClosable(closable);
    });
-    
+
    socket.on('browserWindowIsClosable', (id) => {
        const closable = getWindowById(id).isClosable();
-        
+
        socket.emit('browserWindow-isClosable-completed', closable);
    });
-    
+
    socket.on('browserWindowSetAlwaysOnTop', (id, flag, level, relativeLevel) => {
        getWindowById(id).setAlwaysOnTop(flag, level, relativeLevel);
    });
-    
+
    socket.on('browserWindowIsAlwaysOnTop', (id) => {
        const isAlwaysOnTop = getWindowById(id).isAlwaysOnTop();
-        
+
        socket.emit('browserWindow-isAlwaysOnTop-completed', isAlwaysOnTop);
    });
-    
+
    socket.on('browserWindowCenter', (id) => {
        getWindowById(id).center();
    });
-    
+
    socket.on('browserWindowSetPosition', (id, x, y, animate) => {
        getWindowById(id).setPosition(x, y, animate);
    });
-    
+
    socket.on('browserWindowGetPosition', (id) => {
        const position = getWindowById(id).getPosition();
-        
+
        socket.emit('browserWindow-getPosition-completed', position);
    });
-    
+
    socket.on('browserWindowSetTitle', (id, title) => {
        getWindowById(id).setTitle(title);
    });
-    
+
    socket.on('browserWindowGetTitle', (id) => {
        const title = getWindowById(id).getTitle();
-        
+
        socket.emit('browserWindow-getTitle-completed', title);
    });

    socket.on('browserWindowSetTitle', (id, title) => {
        getWindowById(id).setTitle(title);
    });
-    
+
    socket.on('browserWindowSetSheetOffset', (id, offsetY, offsetX) => {
-        if(offsetX) {
+        if (offsetX) {
            getWindowById(id).setSheetOffset(offsetY, offsetX);
        } else {
            getWindowById(id).setSheetOffset(offsetY);
        }
    });
-    
+
    socket.on('browserWindowFlashFrame', (id, flag) => {
        getWindowById(id).flashFrame(flag);
    });
@@ -491,33 +501,33 @@ module.exports = (socket: SocketIO.Server) => {
    socket.on('browserWindowSetKiosk', (id, flag) => {
        getWindowById(id).setKiosk(flag);
    });
-    
+
    socket.on('browserWindowIsKiosk', (id) => {
        const isKiosk = getWindowById(id).isKiosk();
-        
+
        socket.emit('browserWindow-isKiosk-completed', isKiosk);
    });
-    
+
    socket.on('browserWindowSetRepresentedFilename', (id, filename) => {
        getWindowById(id).setRepresentedFilename(filename);
    });
-    
+
    socket.on('browserWindowGetRepresentedFilename', (id) => {
        const pathname = getWindowById(id).getRepresentedFilename();
-        
+
        socket.emit('browserWindow-getRepresentedFilename-completed', pathname);
    });
-    
+
    socket.on('browserWindowSetDocumentEdited', (id, edited) => {
        getWindowById(id).setDocumentEdited(edited);
    });
-    
+
    socket.on('browserWindowIsDocumentEdited', (id) => {
        const edited = getWindowById(id).isDocumentEdited();
-        
+
        socket.emit('browserWindow-isDocumentEdited-completed', edited);
    });
-    
+
    socket.on('browserWindowFocusOnWebView', (id) => {
        getWindowById(id).focusOnWebView();
    });
@@ -533,33 +543,33 @@ module.exports = (socket: SocketIO.Server) => {
    socket.on('browserWindowReload', (id) => {
        getWindowById(id).reload();
    });
-    
+
    socket.on('browserWindowSetMenu', (id, menuItems) => {
        let menu = null;
-        
-        if(menuItems) {
+
+        if (menuItems) {
            menu = Menu.buildFromTemplate(menuItems);
-            
+
            addMenuItemClickConnector(menu.items, (id) => {
                socket.emit("windowMenuItemClicked", id);
            });
        }
-        
+
        getWindowById(id).setMenu(menu);
    });
-    
+
    function addMenuItemClickConnector(menuItems, callback) {
        menuItems.forEach((item) => {
-            if(item.submenu && item.submenu.items.length > 0) {
+            if (item.submenu && item.submenu.items.length > 0) {
                addMenuItemClickConnector(item.submenu.items, callback);
            }
-            
-            if("id" in item && item.id) {
+
+            if ("id" in item && item.id) {
                item.click = () => { callback(item.id); };
            }
        });
    }
-    
+
    socket.on('browserWindowSetProgressBar', (id, progress) => {
        getWindowById(id).setProgressBar(progress);
    });
@@ -567,16 +577,16 @@ module.exports = (socket: SocketIO.Server) => {
    socket.on('browserWindowSetHasShadow', (id, hasShadow) => {
        getWindowById(id).setHasShadow(hasShadow);
    });
-    
+
    socket.on('browserWindowHasShadow', (id) => {
        const hasShadow = getWindowById(id).hasShadow();
-        
+
        socket.emit('browserWindow-hasShadow-completed', hasShadow);
    });

    socket.on('browserWindowSetThumbarButtons', (id, thumbarButtons: Electron.ThumbarButton[]) => {
        thumbarButtons.forEach(thumbarButton => {
-            const imagePath = path.join(__dirname.replace('api', ''), 'bin', thumbarButton.icon.toString());            
+            const imagePath = path.join(__dirname.replace('api', ''), 'bin', thumbarButton.icon.toString());
            thumbarButton.icon = nativeImage.createFromPath(imagePath);
            thumbarButton.click = () => {
                socket.emit("thumbarButtonClicked", thumbarButton["id"]);
@@ -594,45 +604,45 @@ module.exports = (socket: SocketIO.Server) => {
    socket.on('browserWindowSetThumbnailToolTip', (id, toolTip) => {
        getWindowById(id).setThumbnailToolTip(toolTip);
    });
-    
+
    socket.on('browserWindowSetAppDetails', (id, options) => {
        getWindowById(id).setAppDetails(options);
    });
-    
+
    socket.on('browserWindowShowDefinitionForSelection', (id) => {
        getWindowById(id).showDefinitionForSelection();
    });
-    
+
    socket.on('browserWindowSetAutoHideMenuBar', (id, hide) => {
        getWindowById(id).setAutoHideMenuBar(hide);
    });
-    
+
    socket.on('browserWindowIsMenuBarAutoHide', (id) => {
        const isMenuBarAutoHide = getWindowById(id).isMenuBarAutoHide();
-        
+
        socket.emit('browserWindow-isMenuBarAutoHide-completed', isMenuBarAutoHide);
    });
-    
+
    socket.on('browserWindowSetMenuBarVisibility', (id, visible) => {
        getWindowById(id).setMenuBarVisibility(visible);
    });
-    
+
    socket.on('browserWindowIsMenuBarVisible', (id) => {
        const isMenuBarVisible = getWindowById(id).isMenuBarVisible();
-        
+
        socket.emit('browserWindow-isMenuBarVisible-completed', isMenuBarVisible);
    });
-    
+
    socket.on('browserWindowSetVisibleOnAllWorkspaces', (id, visible) => {
        getWindowById(id).setVisibleOnAllWorkspaces(visible);
    });
-    
+
    socket.on('browserWindowIsVisibleOnAllWorkspaces', (id) => {
        const isVisibleOnAllWorkspaces = getWindowById(id).isVisibleOnAllWorkspaces();
-        
+
        socket.emit('browserWindow-isVisibleOnAllWorkspaces-completed', isVisibleOnAllWorkspaces);
    });
-    
+
    socket.on('browserWindowSetIgnoreMouseEvents', (id, ignore) => {
        getWindowById(id).setIgnoreMouseEvents(ignore);
    });
@@ -653,7 +663,7 @@ module.exports = (socket: SocketIO.Server) => {

    socket.on('browserWindowGetParentWindow', (id) => {
        const browserWindow = getWindowById(id).getParentWindow();
-        
+
        socket.emit('browserWindow-getParentWindow-completed', browserWindow.id);
    });

@@ -665,7 +675,7 @@ module.exports = (socket: SocketIO.Server) => {
        browserWindows.forEach(x => {
            ids.push(x.id);
        })
-        
+
        socket.emit('browserWindow-getChildWindows-completed', ids);
    });

--- a/ElectronNET.Host/api/clipboard.js
+++ b/ElectronNET.Host/api/clipboard.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
    socket.on('clipboard-readText', function (type) {
--- a/ElectronNET.Host/api/clipboard.js.map
+++ b/ElectronNET.Host/api/clipboard.js.map
@@ -1 +1 @@
-{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["clipboard.ts"],"names":[],"mappings":";;AAAA,qCAAqC;AAErC,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IAErC,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI;QACjC,IAAM,IAAI,GAAG,oBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,IAAI,EAAE,IAAI;QACxC,oBAAS,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI;QACjC,IAAM,OAAO,GAAG,oBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,MAAM,EAAE,IAAI;QAC1C,oBAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAC,IAAI;QAChC,IAAM,OAAO,GAAG,oBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI,EAAE,IAAI;QACvC,oBAAS,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE;QAChC,IAAM,QAAQ,GAAG,oBAAS,CAAC,YAAY,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,KAAK,EAAE,GAAG,EAAE,IAAI;QAClD,oBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE;QAChC,IAAM,OAAO,GAAG,oBAAS,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,IAAI;QACtC,oBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,IAAI;QAC9B,oBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,IAAI;QACzC,IAAM,OAAO,GAAG,oBAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,IAAI,EAAE,IAAI;QACpC,oBAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["clipboard.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,iBAAS,UAAC,MAAuB;IAE7B,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI;QACjC,IAAM,IAAI,GAAG,oBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,IAAI,EAAE,IAAI;QACxC,oBAAS,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI;QACjC,IAAM,OAAO,GAAG,oBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,MAAM,EAAE,IAAI;QAC1C,oBAAS,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAC,IAAI;QAChC,IAAM,OAAO,GAAG,oBAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,IAAI,EAAE,IAAI;QACvC,oBAAS,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE;QAChC,IAAM,QAAQ,GAAG,oBAAS,CAAC,YAAY,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,KAAK,EAAE,GAAG,EAAE,IAAI;QAClD,oBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE;QAChC,IAAM,OAAO,GAAG,oBAAS,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,IAAI;QACtC,oBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,IAAI;QAC9B,oBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,IAAI;QACzC,IAAM,OAAO,GAAG,oBAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,IAAI,EAAE,IAAI;QACpC,oBAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/clipboard.ts
+++ b/ElectronNET.Host/api/clipboard.ts
@@ -1,6 +1,6 @@
 import { clipboard } from "electron";

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {

    socket.on('clipboard-readText', (type) => {
        const text = clipboard.readText(type);
--- a/ElectronNET.Host/api/dialog.js
+++ b/ElectronNET.Host/api/dialog.js
@@ -1,39 +1,40 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
-    socket.on('showMessageBox', function (browserWindow, options) {
+    socket.on('showMessageBox', function (browserWindow, options, guid) {
        if ("id" in browserWindow) {
            var window = electron_1.BrowserWindow.fromId(browserWindow.id);
            electron_1.dialog.showMessageBox(window, options, function (response, checkboxChecked) {
-                socket.emit('showMessageBoxComplete', [response, checkboxChecked]);
+                socket.emit('showMessageBoxComplete' + guid, [response, checkboxChecked]);
            });
        }
        else {
+            var message = browserWindow;
+            var id_1 = guid || options;
            electron_1.dialog.showMessageBox(browserWindow, function (response, checkboxChecked) {
-                socket.emit('showMessageBoxComplete', [response, checkboxChecked]);
+                socket.emit('showMessageBoxComplete' + id_1, [response, checkboxChecked]);
            });
        }
    });
-    socket.on('showOpenDialog', function (browserWindow, options) {
+    socket.on('showOpenDialog', function (browserWindow, options, guid) {
        var window = electron_1.BrowserWindow.fromId(browserWindow.id);
        electron_1.dialog.showOpenDialog(window, options, function (filePaths) {
-            socket.emit('showOpenDialogComplete', filePaths || []);
+            socket.emit('showOpenDialogComplete' + guid, filePaths || []);
        });
    });
-    socket.on('showSaveDialog', function (browserWindow, options) {
+    socket.on('showSaveDialog', function (browserWindow, options, guid) {
        var window = electron_1.BrowserWindow.fromId(browserWindow.id);
        electron_1.dialog.showSaveDialog(window, options, function (filename) {
-            socket.emit('showSaveDialogComplete', filename || '');
+            socket.emit('showSaveDialogComplete' + guid, filename || '');
        });
    });
    socket.on('showErrorBox', function (title, content) {
        electron_1.dialog.showErrorBox(title, content);
    });
-    socket.on('showCertificateTrustDialog', function (browserWindow, options) {
+    socket.on('showCertificateTrustDialog', function (browserWindow, options, guid) {
        var window = electron_1.BrowserWindow.fromId(browserWindow.id);
        electron_1.dialog.showCertificateTrustDialog(window, options, function () {
-            socket.emit('showCertificateTrustDialogComplete');
+            socket.emit('showCertificateTrustDialogComplete' + guid);
        });
    });
 };
--- a/ElectronNET.Host/api/dialog.js.map
+++ b/ElectronNET.Host/api/dialog.js.map
@@ -1 +1 @@
-{"version":3,"file":"dialog.js","sourceRoot":"","sources":["dialog.ts"],"names":[],"mappings":";;AAAA,qCAAiD;AAEjD,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO;QAC/C,EAAE,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC;YACxB,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAEpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,QAAQ,EAAE,eAAe;gBAC7D,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,iBAAM,CAAC,cAAc,CAAC,aAAa,EAAE,UAAC,QAAQ,EAAE,eAAe;gBAC3D,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO;QAC/C,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,SAAS;YAC7C,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO;QAC/C,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,QAAQ;YAC5C,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,OAAO;QACrC,iBAAM,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,aAAa,EAAE,OAAO;QAC3D,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,OAAO,EAAE;YAC/C,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"dialog.js","sourceRoot":"","sources":["dialog.ts"],"names":[],"mappings":";AAAA,qCAAiD;AAEjD,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO,EAAE,IAAI;QACrD,IAAI,IAAI,IAAI,aAAa,EAAE;YACvB,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAEpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,QAAQ,EAAE,eAAe;gBAC7D,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAI,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;SACN;aAAM;YACH,IAAI,OAAO,GAAG,aAAa,CAAC;YAC5B,IAAI,IAAE,GAAG,IAAI,IAAI,OAAO,CAAC;YACzB,iBAAM,CAAC,cAAc,CAAC,aAAa,EAAE,UAAC,QAAQ,EAAE,eAAe;gBAC3D,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAE,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;SACN;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO,EAAE,IAAI;QACrD,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,SAAS;YAC7C,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,aAAa,EAAE,OAAO,EAAE,IAAI;QACrD,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAC,QAAQ;YAC5C,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,OAAO;QACrC,iBAAM,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,aAAa,EAAE,OAAO,EAAE,IAAI;QACjE,IAAI,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpD,iBAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,OAAO,EAAE;YAC/C,MAAM,CAAC,IAAI,CAAC,oCAAoC,GAAG,IAAI,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/dialog.ts
+++ b/ElectronNET.Host/api/dialog.ts
@@ -1,31 +1,33 @@
 import { BrowserWindow, dialog } from "electron";

-module.exports = (socket: SocketIO.Server) => {
-    socket.on('showMessageBox', (browserWindow, options) => {
+export = (socket: SocketIO.Socket) => {
+    socket.on('showMessageBox', (browserWindow, options, guid) => {
        if ("id" in browserWindow) {
            var window = BrowserWindow.fromId(browserWindow.id);

            dialog.showMessageBox(window, options, (response, checkboxChecked) => {
-                socket.emit('showMessageBoxComplete', [response, checkboxChecked]);
+                socket.emit('showMessageBoxComplete' + guid, [response, checkboxChecked]);
            });
        } else {
+            var message = browserWindow;
+            let id = guid || options;
            dialog.showMessageBox(browserWindow, (response, checkboxChecked) => {
-                socket.emit('showMessageBoxComplete', [response, checkboxChecked]);
+                socket.emit('showMessageBoxComplete' + id, [response, checkboxChecked]);
            });
        }
    });

-    socket.on('showOpenDialog', (browserWindow, options) => {
+    socket.on('showOpenDialog', (browserWindow, options, guid) => {
        var window = BrowserWindow.fromId(browserWindow.id);
        dialog.showOpenDialog(window, options, (filePaths) => {
-            socket.emit('showOpenDialogComplete', filePaths || []);
+            socket.emit('showOpenDialogComplete' + guid, filePaths || []);
        });
    });

-    socket.on('showSaveDialog', (browserWindow, options) => {
+    socket.on('showSaveDialog', (browserWindow, options, guid) => {
        var window = BrowserWindow.fromId(browserWindow.id);
        dialog.showSaveDialog(window, options, (filename) => {
-            socket.emit('showSaveDialogComplete', filename || '');
+            socket.emit('showSaveDialogComplete' + guid, filename || '');
        });
    });

@@ -33,10 +35,10 @@ module.exports = (socket: SocketIO.Server) => {
        dialog.showErrorBox(title, content);
    });

-    socket.on('showCertificateTrustDialog', (browserWindow, options) => {
+    socket.on('showCertificateTrustDialog', (browserWindow, options, guid) => {
        var window = BrowserWindow.fromId(browserWindow.id);
        dialog.showCertificateTrustDialog(window, options, () => {
-            socket.emit('showCertificateTrustDialogComplete');
+            socket.emit('showCertificateTrustDialogComplete' + guid);
        });
    });
 }
--- a/ElectronNET.Host/api/globalShortcut.js
+++ b/ElectronNET.Host/api/globalShortcut.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
    socket.on('globalShortcut-register', function (accelerator) {
--- a/ElectronNET.Host/api/globalShortcut.js.map
+++ b/ElectronNET.Host/api/globalShortcut.js.map
@@ -1 +1 @@
-{"version":3,"file":"globalShortcut.js","sourceRoot":"","sources":["globalShortcut.ts"],"names":[],"mappings":";;AAAA,qCAA0C;AAE1C,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,WAAW;QAC7C,yBAAc,CAAC,QAAQ,CAAC,WAAW,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,6BAA6B,EAAE,UAAC,WAAW;QACjD,IAAM,YAAY,GAAG,yBAAc,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,2BAA2B,EAAE,UAAC,WAAW;QAC/C,yBAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE;QACtC,IAAI,CAAC;YACD,yBAAc,CAAC,aAAa,EAAE,CAAC;QACnC,CAAC;QAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"globalShortcut.js","sourceRoot":"","sources":["globalShortcut.ts"],"names":[],"mappings":";AAAA,qCAA0C;AAE1C,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,WAAW;QAC7C,yBAAc,CAAC,QAAQ,CAAC,WAAW,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,6BAA6B,EAAE,UAAC,WAAW;QACjD,IAAM,YAAY,GAAG,yBAAc,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,2BAA2B,EAAE,UAAC,WAAW;QAC/C,yBAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE;QACtC,IAAI;YACA,yBAAc,CAAC,aAAa,EAAE,CAAC;SAClC;QAAC,OAAO,KAAK,EAAE,GAAG;IACvB,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/globalShortcut.ts
+++ b/ElectronNET.Host/api/globalShortcut.ts
@@ -1,6 +1,6 @@
 import { globalShortcut } from "electron";

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('globalShortcut-register', (accelerator) => {
        globalShortcut.register(accelerator, () => {
            socket.emit('globalShortcut-pressed', accelerator);
--- a/ElectronNET.Host/api/ipc.js
+++ b/ElectronNET.Host/api/ipc.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
    socket.on('registerIpcMainChannel', function (channel) {
@@ -30,11 +29,11 @@ module.exports = function (socket) {
        for (var _i = 2; _i < arguments.length; _i++) {
            data[_i - 2] = arguments[_i];
        }
+        var _a;
        var window = electron_1.BrowserWindow.fromId(browserWindow.id);
        if (window) {
            (_a = window.webContents).send.apply(_a, [channel].concat(data));
        }
-        var _a;
    });
 };
 //# sourceMappingURL=ipc.js.map
--- a/ElectronNET.Host/api/ipc.js.map
+++ b/ElectronNET.Host/api/ipc.js.map
@@ -1 +1 @@
-{"version":3,"file":"ipc.js","sourceRoot":"","sources":["ipc.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAElD,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,OAAO;QACxC,kBAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,OAAO;QAC5C,kBAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC5B,IAAI,CAAC,GAAQ,MAAM,CAAC;YACpB,CAAC,CAAC,kBAAkB,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC;YACvC,MAAM,CAAC,EAAE,CAAC,OAAO,GAAG,MAAM,EAAE,UAAC,MAAM;gBAC/B,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,OAAO;QAC5C,kBAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,kCAAkC,EAAE,UAAC,OAAO;QAClD,kBAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAC,aAAa,EAAE,OAAO;QAAE,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,6BAAO;;QAC3D,IAAM,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtD,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACT,CAAA,KAAA,MAAM,CAAC,WAAW,CAAA,CAAC,IAAI,YAAC,OAAO,SAAK,IAAI,GAAE;QAC9C,CAAC;;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"ipc.js","sourceRoot":"","sources":["ipc.ts"],"names":[],"mappings":";AAAA,qCAAkD;AAElD,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,OAAO;QACxC,kBAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,OAAO;QAC5C,kBAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC5B,IAAI,CAAC,GAAQ,MAAM,CAAC;YACpB,CAAC,CAAC,kBAAkB,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC;YACvC,MAAM,CAAC,EAAE,CAAC,OAAO,GAAG,MAAM,EAAE,UAAC,MAAM;gBAC/B,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,UAAC,OAAO;QAC5C,kBAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,IAAI;YAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,kCAAkC,EAAE,UAAC,OAAO;QAClD,kBAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAC,aAAa,EAAE,OAAO;QAAE,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,6BAAO;;;QAC3D,IAAM,MAAM,GAAG,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtD,IAAI,MAAM,EAAE;YACR,CAAA,KAAA,MAAM,CAAC,WAAW,CAAA,CAAC,IAAI,YAAC,OAAO,SAAK,IAAI,GAAE;SAC7C;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/ipc.ts
+++ b/ElectronNET.Host/api/ipc.ts
@@ -1,6 +1,6 @@
 import { ipcMain, BrowserWindow } from 'electron';

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('registerIpcMainChannel', (channel) => {
        ipcMain.on(channel, (event, args) => {
            socket.emit(channel, [event.preventDefault(), args]);
--- a/ElectronNET.Host/api/menu.js
+++ b/ElectronNET.Host/api/menu.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 var contextMenuItems = [];
 module.exports = function (socket) {
--- a/ElectronNET.Host/api/menu.js.map
+++ b/ElectronNET.Host/api/menu.js.map
@@ -1 +1 @@
-{"version":3,"file":"menu.js","sourceRoot":"","sources":["menu.ts"],"names":[],"mappings":";;AAAA,qCAA+C;AAC/C,IAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,eAAe,EAAE,SAAS;QACxD,IAAM,IAAI,GAAG,eAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE/C,gCAAgC,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,EAAE,UAAC,EAAE,EAAE,eAAe;YAC9E,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,IAAI;YACV,eAAe,EAAE,eAAe;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,0CAA0C,SAAS,EAAE,eAAe,EAAE,QAAQ;QAC1E,SAAS,CAAC,OAAO,CAAC,UAAC,IAAI;YACnB,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAChD,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;YACpF,CAAC;YAED,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,IAAI,CAAC,KAAK,GAAG,cAAQ,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,UAAC,eAAe;QAC/C,gBAAgB,CAAC,OAAO,CAAC,UAAA,CAAC;YACtB,EAAE,CAAA,CAAC,CAAC,CAAC,eAAe,KAAK,eAAe,CAAC,CAAC,CAAC;gBACvC,IAAI,aAAa,GAAG,wBAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAChC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,SAAS;QAC3C,IAAM,IAAI,GAAG,eAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE/C,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,mCAAmC,SAAS,EAAE,QAAQ;QAClD,SAAS,CAAC,OAAO,CAAC,UAAC,IAAI;YACnB,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAChD,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC5D,CAAC;YAED,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,IAAI,CAAC,KAAK,GAAG,cAAQ,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;AACL,CAAC,CAAA"}
+{"version":3,"file":"menu.js","sourceRoot":"","sources":["menu.ts"],"names":[],"mappings":";AAAA,qCAA+C;AAC/C,IAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,qBAAqB,EAAE,UAAC,eAAe,EAAE,SAAS;QACxD,IAAM,IAAI,GAAG,eAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE/C,gCAAgC,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,EAAE,UAAC,EAAE,EAAE,eAAe;YAC9E,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,IAAI;YACV,eAAe,EAAE,eAAe;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,SAAS,gCAAgC,CAAC,SAAS,EAAE,eAAe,EAAE,QAAQ;QAC1E,SAAS,CAAC,OAAO,CAAC,UAAC,IAAI;YACnB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/C,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;aACnF;YAED,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE;gBACzB,IAAI,CAAC,KAAK,GAAG,cAAQ,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9D;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,UAAC,eAAe;QAC/C,gBAAgB,CAAC,OAAO,CAAC,UAAA,CAAC;YACtB,IAAG,CAAC,CAAC,eAAe,KAAK,eAAe,EAAE;gBACtC,IAAI,aAAa,GAAG,wBAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;aAC/B;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,SAAS;QAC3C,IAAM,IAAI,GAAG,eAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE/C,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,SAAS,yBAAyB,CAAC,SAAS,EAAE,QAAQ;QAClD,SAAS,CAAC,OAAO,CAAC,UAAC,IAAI;YACnB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/C,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC3D;YAED,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE;gBACzB,IAAI,CAAC,KAAK,GAAG,cAAQ,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7C;QACL,CAAC,CAAC,CAAC;IACP,CAAC;AACL,CAAC,CAAA"}
--- a/ElectronNET.Host/api/menu.ts
+++ b/ElectronNET.Host/api/menu.ts
@@ -1,7 +1,7 @@
 import { Menu, BrowserWindow } from "electron";
 const contextMenuItems = [];

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('menu-setContextMenu', (browserWindowId, menuItems) => {
        const menu = Menu.buildFromTemplate(menuItems);

--- a/ElectronNET.Host/api/notification.js
+++ b/ElectronNET.Host/api/notification.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 var notifications = [];
 module.exports = function (socket) {
--- a/ElectronNET.Host/api/notification.js.map
+++ b/ElectronNET.Host/api/notification.js.map
@@ -1 +1 @@
-{"version":3,"file":"notification.js","sourceRoot":"","sources":["notification.ts"],"names":[],"mappings":";;AAAA,qCAAwC;AACxC,IAAM,aAAa,GAA4B,EAAE,CAAC;AAElD,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,OAAO;QACpC,IAAM,YAAY,GAAG,IAAI,uBAAY,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,EAAE,CAAA,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAChB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE;gBACpB,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACP,CAAC;QAED,EAAE,CAAA,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACjB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACP,CAAC;QAED,EAAE,CAAA,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACjB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACP,CAAC;QAED,EAAE,CAAA,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACjB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,KAAK;gBAClC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;YACpE,CAAC,CAAC,CAAC;QACP,CAAC;QAED,EAAE,CAAA,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAC,KAAK,EAAE,KAAK;gBACnC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;QACP,CAAC;QAED,EAAE,CAAA,CAAC,SAAS,CAAC,CAAC,CAAC;YACX,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QAED,YAAY,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,OAAO;QACzC,IAAM,WAAW,GAAG,uBAAY,CAAC,WAAW,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"notification.js","sourceRoot":"","sources":["notification.ts"],"names":[],"mappings":";AAAA,qCAAwC;AACxC,IAAM,aAAa,GAA4B,EAAE,CAAC;AAElD,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,OAAO;QACpC,IAAM,YAAY,GAAG,IAAI,uBAAY,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,IAAG,OAAO,CAAC,MAAM,EAAE;YACf,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE;gBACpB,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;SACN;QAED,IAAG,OAAO,CAAC,OAAO,EAAE;YAChB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;SACN;QAED,IAAG,OAAO,CAAC,OAAO,EAAE;YAChB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;SACN;QAED,IAAG,OAAO,CAAC,OAAO,EAAE;YAChB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAK,EAAE,KAAK;gBAClC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;YACpE,CAAC,CAAC,CAAC;SACN;QAED,IAAG,OAAO,CAAC,QAAQ,EAAE;YACjB,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAC,KAAK,EAAE,KAAK;gBACnC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;SACN;QAED,IAAG,SAAS,EAAE;YACV,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACpC;QAED,YAAY,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,OAAO;QACzC,IAAM,WAAW,GAAG,uBAAY,CAAC,WAAW,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/notification.ts
+++ b/ElectronNET.Host/api/notification.ts
@@ -1,7 +1,7 @@
 import { Notification } from "electron";
 const notifications: Electron.Notification[] = [];

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('createNotification', (options) => {
        const notification = new Notification(options);
        let haveEvent = false;
--- a/ElectronNET.Host/api/screen.js
+++ b/ElectronNET.Host/api/screen.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
    socket.on('register-screen-display-added', function (id) {
@@ -22,7 +21,7 @@ module.exports = function (socket) {
        socket.emit('screen-getCursorScreenPointCompleted', point);
    });
    socket.on('screen-getMenuBarHeight', function () {
-        var height = electron_1.screen.getMenuBarHeight();
+        var height = electron_1.screen.getPrimaryDisplay().workArea;
        socket.emit('screen-getMenuBarHeightCompleted', height);
    });
    socket.on('screen-getPrimaryDisplay', function () {
--- a/ElectronNET.Host/api/screen.js.map
+++ b/ElectronNET.Host/api/screen.js.map
@@ -1 +1 @@
-{"version":3,"file":"screen.js","sourceRoot":"","sources":["screen.ts"],"names":[],"mappings":";;AAAA,qCAAkC;AAElC,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,UAAC,EAAE;QAC1C,iBAAM,CAAC,EAAE,CAAC,eAAe,EAAE,UAAC,KAAK,EAAE,OAAO;YACtC,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iCAAiC,EAAE,UAAC,EAAE;QAC5C,iBAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,KAAK,EAAE,OAAO;YACxC,MAAM,CAAC,IAAI,CAAC,8BAA8B,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yCAAyC,EAAE,UAAC,EAAE;QACpD,iBAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,KAAK,EAAE,OAAO,EAAE,cAAc;YAChE,MAAM,CAAC,IAAI,CAAC,sCAAsC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,6BAA6B,EAAE;QACrC,IAAI,KAAK,GAAG,iBAAM,CAAC,oBAAoB,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE;QACjC,IAAI,MAAM,GAAG,iBAAM,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,0BAA0B,EAAE;QAClC,IAAI,OAAO,GAAG,iBAAM,CAAC,iBAAiB,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE;QAC/B,IAAI,OAAO,GAAG,iBAAM,CAAC,cAAc,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,UAAC,KAAK;QAC7C,IAAI,OAAO,GAAG,iBAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,2BAA2B,EAAE,UAAC,SAAS;QAC7C,IAAI,OAAO,GAAG,iBAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"screen.js","sourceRoot":"","sources":["screen.ts"],"names":[],"mappings":";AAAA,qCAAkC;AAElC,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,UAAC,EAAE;QAC1C,iBAAM,CAAC,EAAE,CAAC,eAAe,EAAE,UAAC,KAAK,EAAE,OAAO;YACtC,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,iCAAiC,EAAE,UAAC,EAAE;QAC5C,iBAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,UAAC,KAAK,EAAE,OAAO;YACxC,MAAM,CAAC,IAAI,CAAC,8BAA8B,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yCAAyC,EAAE,UAAC,EAAE;QACpD,iBAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,KAAK,EAAE,OAAO,EAAE,cAAc;YAChE,MAAM,CAAC,IAAI,CAAC,sCAAsC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,6BAA6B,EAAE;QACrC,IAAI,KAAK,GAAG,iBAAM,CAAC,oBAAoB,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE;QACjC,IAAI,MAAM,GAAG,iBAAM,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,0BAA0B,EAAE;QAClC,IAAI,OAAO,GAAG,iBAAM,CAAC,iBAAiB,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE;QAC/B,IAAI,OAAO,GAAG,iBAAM,CAAC,cAAc,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,UAAC,KAAK;QAC7C,IAAI,OAAO,GAAG,iBAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,2BAA2B,EAAE,UAAC,SAAS;QAC7C,IAAI,OAAO,GAAG,iBAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/screen.ts
+++ b/ElectronNET.Host/api/screen.ts
@@ -1,6 +1,6 @@
 import { screen } from "electron";

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('register-screen-display-added', (id) => {
        screen.on('display-added', (event, display) => {
            socket.emit('screen-display-added-event' + id, display);
@@ -25,7 +25,7 @@ module.exports = (socket: SocketIO.Server) => {
    });

    socket.on('screen-getMenuBarHeight', () => {
-        var height = screen.getMenuBarHeight();
+        var height = screen.getPrimaryDisplay().workArea;
        socket.emit('screen-getMenuBarHeightCompleted', height);
    });

--- a/ElectronNET.Host/api/shell.js
+++ b/ElectronNET.Host/api/shell.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 module.exports = function (socket) {
    socket.on('shell-showItemInFolder', function (fullPath) {
--- a/ElectronNET.Host/api/shell.js.map
+++ b/ElectronNET.Host/api/shell.js.map
@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["shell.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,QAAQ;QACzC,IAAM,OAAO,GAAG,gBAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,QAAQ;QACjC,IAAM,OAAO,GAAG,gBAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,GAAG,EAAE,OAAO,EAAE,QAAQ;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,EAAE,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC;YACtB,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,UAAC,KAAK;gBAC7C,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACjB,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,UAAC,QAAQ;QACxC,IAAM,OAAO,GAAG,gBAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEhD,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE;QACpB,gBAAK,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,YAAY,EAAE,SAAS,EAAE,OAAO;QAClE,IAAM,OAAO,GAAG,gBAAK,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1E,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,YAAY;QAC7C,IAAM,eAAe,GAAG,gBAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAE7D,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["shell.ts"],"names":[],"mappings":";AAAA,qCAAiC;AAEjC,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,QAAQ;QACzC,IAAM,OAAO,GAAG,gBAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAC,QAAQ;QACjC,IAAM,OAAO,GAAG,gBAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,GAAG,EAAE,OAAO,EAAE,QAAQ;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,OAAO,IAAI,QAAQ,EAAE;YACrB,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,UAAC,KAAK;gBAC7C,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;SACN;aAAM,IAAI,OAAO,EAAE;YAChB,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAC9C;aAAM;YACH,OAAO,GAAG,gBAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACrC;QAED,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,UAAC,QAAQ;QACxC,IAAM,OAAO,GAAG,gBAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEhD,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE;QACpB,gBAAK,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,YAAY,EAAE,SAAS,EAAE,OAAO;QAClE,IAAM,OAAO,GAAG,gBAAK,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1E,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,YAAY;QAC7C,IAAM,eAAe,GAAG,gBAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAE7D,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC,CAAA"}
--- a/ElectronNET.Host/api/shell.ts
+++ b/ElectronNET.Host/api/shell.ts
@@ -1,6 +1,6 @@
 import { shell } from "electron";

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('shell-showItemInFolder', (fullPath) => {
        const success = shell.showItemInFolder(fullPath);

--- a/ElectronNET.Host/api/tray.js
+++ b/ElectronNET.Host/api/tray.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 var path = require('path');
 var tray;
--- a/ElectronNET.Host/api/tray.js.map
+++ b/ElectronNET.Host/api/tray.js.map
@@ -1 +1 @@
-{"version":3,"file":"tray.js","sourceRoot":"","sources":["tray.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tray.js","sourceRoot":"","sources":["tray.ts"],"names":[],"mappings":"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"}
--- a/ElectronNET.Host/api/tray.ts
+++ b/ElectronNET.Host/api/tray.ts
@@ -2,7 +2,7 @@ import { Menu, Tray, nativeImage } from "electron";
 const path = require('path');
 let tray: Electron.Tray;

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('register-tray-click', (id) => {
        if (tray) {
            tray.on('click', (event, bounds) => {
--- a/ElectronNET.Host/api/webContents.js
+++ b/ElectronNET.Host/api/webContents.js
@@ -1,5 +1,4 @@
 "use strict";
-exports.__esModule = true;
 var electron_1 = require("electron");
 var fs = require('fs');
 module.exports = function (socket) {
@@ -40,6 +39,10 @@ module.exports = function (socket) {
            });
        });
    });
+    socket.on('webContents-getUrl', function (id) {
+        var browserWindow = getWindowById(id);
+        socket.emit('webContents-getUrl' + id, browserWindow.webContents.getURL());
+    });
    function getWindowById(id) {
        return electron_1.BrowserWindow.fromId(id);
    }
--- a/ElectronNET.Host/api/webContents.js.map
+++ b/ElectronNET.Host/api/webContents.js.map
@@ -1 +1 @@
-{"version":3,"file":"webContents.js","sourceRoot":"","sources":["webContents.ts"],"names":[],"mappings":";;AAAA,qCAAyC;AACzC,IAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzB,MAAM,CAAC,OAAO,GAAG,UAAC,MAAuB;IACrC,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE,UAAC,EAAE;QACzC,IAAI,aAAa,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtC,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxD,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,UAAC,KAAK,EAAE,MAAM;YAClD,MAAM,CAAC,IAAI,CAAC,qBAAqB,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oCAAoC,EAAE,UAAC,EAAE;QAC/C,IAAI,aAAa,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtC,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAChE,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,EAAE,EAAE,OAAO;QAC7C,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACV,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QACjD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,EAAE,EAAE,OAAO,EAAE,IAAI;QAClD,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,UAAC,KAAK,EAAE,IAAI;YAChE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,MAAM,KAAK,CAAC;YAChB,CAAC;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,UAAC,KAAK;gBAC7B,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;oBACV,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;gBACzD,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,uBAAuB,EAAU;QAC7B,MAAM,CAAC,wBAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"webContents.js","sourceRoot":"","sources":["webContents.ts"],"names":[],"mappings":";AAAA,qCAAyC;AACzC,IAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzB,iBAAS,UAAC,MAAuB;IAC7B,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE,UAAC,EAAE;QACzC,IAAI,aAAa,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtC,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxD,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,UAAC,KAAK,EAAE,MAAM;YAClD,MAAM,CAAC,IAAI,CAAC,qBAAqB,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oCAAoC,EAAE,UAAC,EAAE;QAC/C,IAAI,aAAa,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QAEtC,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAChE,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,iBAAiB,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,UAAC,EAAE,EAAE,OAAO;QAC7C,IAAI,OAAO,EAAE;YACT,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACvD;aAAM;YACH,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;SAChD;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,UAAC,EAAE,EAAE,OAAO,EAAE,IAAI;QAClD,aAAa,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,UAAC,KAAK,EAAE,IAAI;YAChE,IAAI,KAAK,EAAE;gBACP,MAAM,KAAK,CAAC;aACf;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,UAAC,KAAK;gBAC7B,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;iBACxD;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAC;iBACvD;YACH,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE;QACxC,IAAI,aAAa,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,oBAAoB,GAAG,EAAE,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,EAAU;QAC7B,OAAO,wBAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;AACL,CAAC,CAAC"}
--- a/ElectronNET.Host/api/webContents.ts
+++ b/ElectronNET.Host/api/webContents.ts
@@ -1,7 +1,7 @@
 import { BrowserWindow } from 'electron';
 const fs = require('fs');

-module.exports = (socket: SocketIO.Server) => {
+export = (socket: SocketIO.Socket) => {
    socket.on('register-webContents-crashed', (id) => {
        var browserWindow = getWindowById(id);

@@ -44,6 +44,11 @@ module.exports = (socket: SocketIO.Server) => {
        });
    });

+    socket.on('webContents-getUrl', function (id) {
+        var browserWindow = getWindowById(id);
+        socket.emit('webContents-getUrl' + id, browserWindow.webContents.getURL());
+    });
+
    function getWindowById(id: number): Electron.BrowserWindow {
        return BrowserWindow.fromId(id);
    }
--- a/ElectronNET.Host/main.js
+++ b/ElectronNET.Host/main.js
@@ -1,37 +1,95 @@
-const { app } = require('electron');
+const { app } = require('electron');
+const { BrowserWindow, dialog, shell } = require('electron');
 const fs = require('fs');
 const path = require('path');
 const process = require('child_process').spawn;
 const portfinder = require('detect-port');
 let io, browserWindows, ipc, apiProcess, loadURL;
-let appApi, menu, dialog, notification, tray, webContents;
-let globalShortcut, shell, screen, clipboard;
+let appApi, menu, dialogApi, notification, tray, webContents;
+let globalShortcut, shellApi, screen, clipboard;
+let splashScreen, mainWindowId;
+
+const manifestJsonFilePath = path.join(__dirname, 'bin', 'electron.manifest.json');
+const manifestJsonFile = require(manifestJsonFilePath);
+if (manifestJsonFile.singleInstance) {
+    const shouldQuit = app.requestSingleInstanceLock();
+    app.on('second-instance', (commandLine, workingDirectory) => {
+        mainWindowId && BrowserWindow.fromId(mainWindowId) && BrowserWindow.fromId(mainWindowId).show();
+    });
+
+    if (shouldQuit) {
+        app.quit();
+    }
+}

 app.on('ready', () => {
+    if (isSplashScreenEnabled()) {
+        startSplashScreen();
+    }
+
    portfinder(8000, (error, port) => {
        startSocketApiBridge(port);
    });
 });

+function isSplashScreenEnabled() {
+    return Boolean(manifestJsonFile.loadingUrl);
+}
+
+function startSplashScreen() {
+    let loadingUrl = manifestJsonFile.loadingUrl;
+    let icon = manifestJsonFile.icon;
+
+    if (loadingUrl) {
+        splashScreen = new BrowserWindow({
+            width: manifestJsonFile.width,
+            height: manifestJsonFile.height,
+            transparent: true,
+            frame: false,
+            show: false,
+            icon: path.join(__dirname, icon)
+        });
+
+        if (manifestJsonFile.devTools) {
+            splashScreen.webContents.openDevTools();
+        }
+
+        splashScreen.loadURL(loadingUrl);
+        splashScreen.once('ready-to-show', () => {
+            splashScreen.show();
+        });
+
+        splashScreen.on('closed', () => {
+            splashScreen = null;
+        });
+    }
+}
+
 function startSocketApiBridge(port) {
    io = require('socket.io')(port);
    startAspCoreBackend(port);

    io.on('connection', (socket) => {
-        console.log('ASP.NET Core Application connected...');
-        
+        global['electronsocket'] = socket;
+        global['electronsocket'].setMaxListeners(0);
+        console.log('ASP.NET Core Application connected...', 'global.electronsocket', global['electronsocket'].id, new Date());
+
        appApi = require('./api/app')(socket, app);
-        browserWindows = require('./api/browserWindows')(socket);
-        ipc = require('./api/ipc')(socket);        
+        browserWindows = require('./api/browserWindows')(socket, app);
+        ipc = require('./api/ipc')(socket);
        menu = require('./api/menu')(socket);
-        dialog = require('./api/dialog')(socket);
+        dialogApi = require('./api/dialog')(socket);
        notification = require('./api/notification')(socket);
        tray = require('./api/tray')(socket);
        webContents = require('./api/webContents')(socket);
        globalShortcut = require('./api/globalShortcut')(socket);
-        shell = require('./api/shell')(socket);
+        shellApi = require('./api/shell')(socket);
        screen = require('./api/screen')(socket);
        clipboard = require('./api/clipboard')(socket);
+
+        if (splashScreen && !splashScreen.isDestroyed()) {
+            splashScreen.close();
+        }
    });
 }

@@ -39,38 +97,19 @@ function startAspCoreBackend(electronPort) {
    portfinder(8000, (error, electronWebPort) => {
        loadURL = `http://localhost:${electronWebPort}`
        const parameters = [`/electronPort=${electronPort}`, `/electronWebPort=${electronWebPort}`];
+        let binaryFile = manifestJsonFile.executable;

-        const manifestFile = require("./bin/electron.manifest.json");
-        let binaryFile = manifestFile.executable;
-        
-        const os = require("os");
-        if(os.platform() === "win32") {
+        const os = require('os');
+        if (os.platform() === 'win32') {
            binaryFile = binaryFile + '.exe';
        }
-        
+
        const binFilePath = path.join(__dirname, 'bin', binaryFile);
-        apiProcess = process(binFilePath, parameters);
+        var options = { cwd: path.join(__dirname, 'bin') };
+        apiProcess = process(binFilePath, parameters, options);

        apiProcess.stdout.on('data', (data) => {
-            var text = data.toString();
            console.log(`stdout: ${data.toString()}`);
        });
    });
 }
-
-// Quit when all windows are closed.
-app.on('window-all-closed', () => {
-    // On macOS it is common for applications and their menu bar
-    // to stay active until the user quits explicitly with Cmd + Q
-    if (process.platform !== 'darwin') {
-        app.quit();
-    }
-});
-
-//app.on('activate', () => {
-    // On macOS it's common to re-create a window in the app when the
-    // dock icon is clicked and there are no other windows open.
-//    if (win === null) {
-//        createWindow();
-//    }
-//});
--- a/ElectronNET.Host/package-lock.json
+++ b/ElectronNET.Host/package-lock.json
--- a/ElectronNET.Host/package.json
+++ b/ElectronNET.Host/package.json
@@ -1,21 +1,22 @@
 {
-  "name": "ElectronNET.Host",
+  "name": "electron.net.host",
  "version": "1.0.0",
  "description": "",
  "main": "main.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
+  "author": "Gregor Biswanger",
  "license": "ISC",
+  "scripts": {
+    "start": "tsc -p ."
+  },
  "dependencies": {
-    "detect-port": "^1.2.1",
-    "electron": "^1.7.8",
-    "socket.io": "^2.0.3"
+    "detect-port": "^1.2.3",
+    "electron": "^3.0.0",
+    "socket.io": "^2.1.1"
  },
  "devDependencies": {
-    "@types/electron": "^1.6.10",
-    "@types/socket.io": "^1.4.31"
+    "@types/socket.io": "^1.4.38",
+    "@types/node": "^10.11.0",
+    "tslint": "^5.11.0",
+    "typescript": "^3.0.3"
  }
 }
--- a/ElectronNET.Host/tsconfig.json
+++ b/ElectronNET.Host/tsconfig.json
@@ -1,7 +1,8 @@
 {
    "compilerOptions": {
        "module": "commonjs",
-        "sourceMap": true
+        "sourceMap": true,
+        "skipLibCheck": true
    },
    "exclude": [
        "node_modules"
--- a/ElectronNET.Host/tslint.json
+++ b/ElectronNET.Host/tslint.json
@@ -0,0 +1,129 @@
+{
+    "rulesDirectory": [],
+    "rules": {
+        "arrow-return-shorthand": true,
+        "callable-types": true,
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "curly": true,
+        "deprecation": {
+            "severity": "warn"
+        },
+        "eofline": true,
+        "forin": true,
+        "import-blacklist": [
+            true,
+            "rxjs/Rx"
+        ],
+        "import-spacing": true,
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "interface-over-type-literal": true,
+        "label-position": true,
+        "max-line-length": [
+            true,
+            140
+        ],
+        "member-access": false,
+        "member-ordering": [
+            true,
+            {
+                "order": [
+                    "static-field",
+                    "instance-field",
+                    "static-method",
+                    "instance-method"
+                ]
+            }
+        ],
+        "no-arg": true,
+        "no-bitwise": true,
+        "no-console": [
+            true,
+            "debug",
+            "info",
+            "time",
+            "timeEnd",
+            "trace"
+        ],
+        "no-construct": true,
+        "no-debugger": true,
+        "no-duplicate-super": true,
+        "no-empty": false,
+        "no-empty-interface": true,
+        "no-eval": true,
+        "no-inferrable-types": [
+            true,
+            "ignore-params"
+        ],
+        "no-misused-new": true,
+        "no-non-null-assertion": true,
+        "no-redundant-jsdoc": true,
+        "no-shadowed-variable": true,
+        "no-string-literal": false,
+        "no-string-throw": true,
+        "no-switch-case-fall-through": true,
+        "no-trailing-whitespace": true,
+        "no-unnecessary-initializer": true,
+        "no-unused-expression": true,
+        "no-use-before-declare": true,
+        "no-var-keyword": true,
+        "object-literal-sort-keys": false,
+        "one-line": [
+            true,
+            "check-open-brace",
+            "check-catch",
+            "check-else",
+            "check-whitespace"
+        ],
+        "prefer-const": true,
+        "quotemark": [
+            true,
+            "single"
+        ],
+        "radix": true,
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "triple-equals": [
+            true,
+            "allow-null-check"
+        ],
+        "typedef-whitespace": [
+            true,
+            {
+                "call-signature": "nospace",
+                "index-signature": "nospace",
+                "parameter": "nospace",
+                "property-declaration": "nospace",
+                "variable-declaration": "nospace"
+            }
+        ],
+        "unified-signatures": true,
+        "variable-name": false,
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ],
+        "no-output-on-prefix": true,
+        "use-input-property-decorator": true,
+        "use-output-property-decorator": true,
+        "use-host-property-decorator": true,
+        "no-input-rename": true,
+        "no-output-rename": true,
+        "use-life-cycle-interface": true,
+        "use-pipe-transform-interface": true,
+        "component-class-suffix": true,
+        "directive-class-suffix": true
+    }
+}
--- a/ElectronNET.WebApp/Controllers/ShortcutsController.cs
+++ b/ElectronNET.WebApp/Controllers/ShortcutsController.cs
@@ -1,6 +1,7 @@
 using ElectronNET.API;
 using ElectronNET.API.Entities;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;

 namespace ElectronNET.WebApp.Controllers
 {
@@ -20,8 +21,7 @@ namespace ElectronNET.WebApp.Controllers

                    await Electron.Dialog.ShowMessageBoxAsync(options);
                });
-
-                Electron.App.WillQuit += () => Electron.GlobalShortcut.UnregisterAll();
+                Electron.App.WillQuit += arg => Task.Run(() => Electron.GlobalShortcut.UnregisterAll());
            }

            return View();
--- a/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
  </PropertyGroup>
  <ItemGroup>
@@ -15,18 +15,17 @@
    <Folder Include="wwwroot\assets\" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="ElectronNET.API" Version="1.0.0" />
    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
  </ItemGroup>
  <ItemGroup>
-    <DotNetCliToolReference Include="ElectronNET.CLI" Version="*" />
+    <ProjectReference Include="..\ElectronNET.API\ElectronNET.API.csproj" />
  </ItemGroup>
  <ItemGroup>
    <None Update="Assets\electron.ico">
--- a/ElectronNET.WebApp/Startup.cs
+++ b/ElectronNET.WebApp/Startup.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;

 namespace ElectronNET.WebApp
 {
@@ -61,7 +62,7 @@ namespace ElectronNET.WebApp
            });

            browserWindow.OnReadyToShow += () => browserWindow.Show();
-            browserWindow.SetTitle(Configuration["DemoTitleInSettings"] );
+            browserWindow.SetTitle(Configuration["DemoTitleInSettings"]);
        }
    }
 }
--- a/ElectronNET.WebApp/Views/Shortcuts/Index.cshtml
+++ b/ElectronNET.WebApp/Views/Shortcuts/Index.cshtml
@@ -47,7 +47,7 @@
    await Electron.Dialog.ShowMessageBoxAsync(options);
 });

-Electron.App.WillQuit += () => Electron.GlobalShortcut.UnregisterAll();</code></pre>
+Electron.App.WillQuit += (args) => Task.Run(() => Electron.GlobalShortcut.UnregisterAll());</code></pre>

          <div class="demo-protip">
            <h2>ProTip</h2>
--- a/ElectronNET.sln
+++ b/ElectronNET.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElectronNET.WebApp", "ElectronNET.WebApp\ElectronNET.WebApp.csproj", "{7C048379-401C-4345-B5E7-BE232DEA8157}"
 EndProject
@@ -32,7 +32,10 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "ElectronNET.Host", "Electro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2914CCF7-27C2-42AE-849A-2F0C1BC7CDFA}"
 	ProjectSection(SolutionItems) = preProject
+		buildAll.cmd = buildAll.cmd
+		buildAll.sh = buildAll.sh
 		buildReleaseNuGetPackages.cmd = buildReleaseNuGetPackages.cmd
+		Changelog.md = Changelog.md
 	EndProjectSection
 EndProject
 Global
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,8 +2,7 @@
 <configuration>
 <packageSources>
    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
    <add key="LocalDev" value="artifacts" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 </packageSources>
-
 </configuration>
--- a/README.md
+++ b/README.md
@@ -3,19 +3,19 @@

 AppVeyor (Win/Linux): [![Build status](https://ci.appveyor.com/api/projects/status/q95h4xt14papwi05/branch/master?svg=true)](https://ci.appveyor.com/project/robertmuehsig/electron-net/branch/master)

-* Checkout AppVeyor Aritfacts: Contains the WebApp sample builded for Windows & Linux!
+* Checkout AppVeyor Artifacts: Contains the WebApp sample built for Windows & Linux!

 Travis-CI (Win/macOS/Linux): [![Build Status](https://travis-ci.org/ElectronNET/Electron.NET.svg?branch=master)](https://travis-ci.org/ElectronNET/Electron.NET)

 Build cross platform desktop apps with .NET Core 2.0 and ASP.NET NET Core. 

-Electron.NET is a __wrapper__ around a "normal" Electron application with a embedded ASP.NET Core application. Via our Electron.NET IPC bridge we can invoke Electron APIs from .NET.
+Electron.NET is a __wrapper__ around a "normal" Electron application with an embedded ASP.NET Core application. Via our Electron.NET IPC bridge we can invoke Electron APIs from .NET.

 The CLI extensions hosts our toolset to build and start Electron.NET applications.

 ## Wait - you host a .NET Core app inside Electron? Why?

-Well... there are lots of different approaches how to get a X-plat desktop app running. We thought it would be nice for .NET devs to use the ASP.NET Core environment and just embed it inside a pretty robust X-plat enviroment called Electron. Porting Electron to .NET is not a goal of this project, at least we don't have any clue how do to it. We just combine ASP.NET Core & Electron. 
+Well... there are lots of different approaches how to get a X-plat desktop app running. We thought it would be nice for .NET devs to use the ASP.NET Core environment and just embed it inside a pretty robust X-plat enviroment called Electron. Porting Electron to .NET is not a goal of this project, at least we don't have any clue how to do it. We just combine ASP.NET Core & Electron. 

 # NuGet:

@@ -84,13 +84,20 @@ __Please note:__ Currently it is important to use ASP.NET Core with MVC. If you

 ## Start the Application

-For the tooling you will need your dotnet-electronize package [ElectronNET.CLI NuGet package](https://www.nuget.org/packages/ElectronNET.CLI/). This package __must__ be referenced in the .csproj like this:
+To start the application make sure you have installed the "[ElectronNET.CLI](https://www.nuget.org/packages/ElectronNET.CLI/)" packages as global tool:
+
+    dotnet tool install ElectronNET.CLI -g
+
+### ElectronNET.CLI Version 0.0.9
+
+In the Version 0.0.9 the CLI was not a global tool and needed to be registred like this in the .csproj:

 ```
    <ItemGroup>
-       <DotNetCliToolReference Include="ElectronNET.CLI" Version="*" />
+         <DotNetCliToolReference Include="ElectronNET.CLI" Version="0.0.9" />
    </ItemGroup>
 ```
+
 After you edited the .csproj-file, you need to restore your NuGet packages within your Project. Run the follwoing command in your ASP.NET Core folder:

 ```
@@ -123,28 +130,42 @@ Start your Electron.NET application with the Electron.NET CLI command. In Visual
 ## Usage of the Electron-API

 A complete documentation will follow. Until then take a look in the source code of the sample application:  
-[Electron.NET API Demos](https://github.com/ElectronNET/electron.net-api-demos)
+[Electron.NET API Demos](https://github.com/ElectronNET/electron.net-api-demos)  

+In this YouTube video, we show you how you can create a new project, use the Electron.NET API, debug a application and build an executable desktop app for Windows: [Electron.NET - Getting Started](https://www.youtube.com/watch?v=nuM6AojRFHk)  
+  
 ## Build

 Here you need the Electron.NET CLI too. Type following command in your ASP.NET Core folder:

 ```
-    dotnet electronize build
+    dotnet electronize build /target win
 ```

-In your default setting we just build the application for the OS you are running (Windows builds Windows, macOS builds macOS etc.), but this can be changed with:
+There are additional platforms available:

 ```
-    dotnet electronize build win
-    dotnet electronize build osx
-    dotnet electronize build linux
+    dotnet electronize build /target win
+    dotnet electronize build /target osx
+    dotnet electronize build /target linux
+```
+
+Those three "default" targets will produce x64 packages for those platforms.
+
+For certain NuGet packages or certain scenarios you may want to build a pure x86 application. To support those things you can define the desired [.NET Core runtime](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog), the [electron platform](https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#platform) and [electron architecture](https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#arch) like this:
+
+```
+    dotnet electronize build build /target custom win7-x86;win32 /electron-arch ia32 
 ```

 The end result should be an electron app under your __/bin/desktop__ folder.

+## Starter kits
+
+There is a React/Typescript/MobX starter kit at https://github.com/yoDon/Electron.NET-React-Typescript-MobX
+
 ### Note
-> macOS builds on Windows are currently not supported, because the build just hangs, but I'm not sure why. The macOS builds works on Linux/macOS however.
+> macOS builds can't be created on Windows machines because they require symlinks that aren't supported on Windows (per [this Electron issue](https://github.com/electron-userland/electron-packager/issues/71)). macOS builds can be produced on either Linux or macOS machines.

 # Working with this Repo

--- a/buildAll.cmd
+++ b/buildAll.cmd
@@ -4,7 +4,7 @@ cd ElectronNet.API
 dotnet restore
 dotnet build
 cd ..
-echo "Restore & Build API"
+echo "Restore & Build CLI"
 cd ElectronNet.CLI
 dotnet restore
 dotnet build
@@ -13,14 +13,30 @@ echo "Restore & Build WebApp Demo"
 cd ElectronNet.WebApp
 dotnet restore
 dotnet build
+
 echo "Invoke electronize build in WebApp Demo"

-echo "-- win"
-dotnet electronize build win
+echo "Install CLI"

-echo "-- linux"
-dotnet electronize build linux
+dotnet tool uninstall ElectronNET.CLI -g
+dotnet tool install ElectronNET.CLI -g

-REM Not supported on Windows Systems, because of SymLinks...
-REM echo "-- osx"
-REM   dotnet electronize build osx
+echo "/target xxx (dev-build)"
+electronize build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32  /electron-params "--prune=true "
+
+echo "/target win (dev-build)"
+electronize build /target win
+
+echo "/target linux (dev-build)"
+electronize build /target linux
+
+echo "/target custom win7-x86;win32 (dev-build)"
+electronize build /target custom win7-x86;win32
+
+
+:: Be aware, that for non-electronnet-dev environments the correct 
+:: invoke command would be dotnet electronize ...
+
+:: Not supported on Windows Systems, because of SymLinks...
+:: echo "/target osx"
+::   dotnet electronize build /target osx
--- a/buildAll.sh
+++ b/buildAll.sh
@@ -5,22 +5,35 @@ cd $dir/ElectronNET.API
 dotnet restore
 dotnet build
 cd ..
-echo "Restore & Build API"
+
+echo "Restore & Build CLI"
 cd $dir/ElectronNET.CLI
 dotnet restore
 dotnet build
 cd ..
+
 echo "Restore & Build WebApp Demo"
 cd $dir/ElectronNET.WebApp
 dotnet restore
 dotnet build

+echo "Install CLI as dotnet tool"
+
+dotnet tool uninstall ElectronNET.CLI -g
+dotnet tool install ElectronNET.CLI -g
+
 echo "Invoke electronize build in WebApp Demo"
-echo "-- win"
-dotnet electronize build win
+echo "/target win (dev-build)"
+electronize build /target win

-echo "-- linux"
-dotnet electronize build linux
+echo "/target linux (dev-build)"
+electronize build /target linux

-echo "-- osx"
-dotnet electronize build osx
+echo "/target osx (dev-build)"
+electronize build /target osx
+
+echo "/target custom win7-x86;win32 (dev-build)"
+electronize build /target custom "win7-x86;win32"
+
+# Be aware, that for non-electronnet-dev environments the correct 
+# invoke command would be dotnet electronize ...
--- a/buildReleaseNuGetPackages.cmd
+++ b/buildReleaseNuGetPackages.cmd
@@ -2,11 +2,11 @@ echo "Start building Electron.NET dev stack..."
 echo "Restore & Build API"
 cd ElectronNet.API
 dotnet restore
-dotnet build --configuration Release --force /property:Version=0.0.7
-dotnet pack /p:Version=0.0.7 --configuration Release --force --output "%~dp0artifacts"
+dotnet build --configuration Release --force /property:Version=0.0.10
+dotnet pack /p:Version=0.0.10 --configuration Release --force --output "%~dp0artifacts"
 cd ..
-echo "Restore & Build API"
+echo "Restore & Build CLI"
 cd ElectronNet.CLI
 dotnet restore
-dotnet build --configuration Release --force /property:Version=0.0.7
-dotnet pack /p:Version=0.0.7 --configuration Release --force --output "%~dp0artifacts"
+dotnet build --configuration Release --force /property:Version=0.0.10
+dotnet pack /p:Version=0.0.10 --configuration Release --force --output "%~dp0artifacts"
Author	SHA1	Message	Date
Robert Muehsig	8c171ba948	0.0.10	2018-12-05 22:40:06 +01:00
Robert Muehsig	c1bd48b58d	adding the resultcode to the output	2018-09-27 22:48:54 +02:00
Gregor Biswanger	c10e5b74bd	Merge pull request #167 from smack0007/manifest-path manifestJsonFilePath is now calculated with path.join instead of bein…	2018-09-26 22:46:39 +02:00
smack0007	0c024448b7	manifestJsonFilePath is now calculated with path.join instead of being a hard coded string.	2018-09-26 22:32:07 +02:00
Gregor Biswanger	ac9d346955	refactoring	2018-09-26 01:31:53 +02:00
Gregor Biswanger	524e6c8dff	fix planned breaking API changes from Electron 4.0	2018-09-25 23:10:58 +02:00
Gregor Biswanger	17399f3f6c	Merge pull request #162 from ElectronNET/dev/move-to-globaltool CLI is now a dotnet tool	2018-09-25 18:33:24 +02:00
Robert Muehsig	d50984a465	path fix	2018-09-03 23:13:02 +02:00
Robert Muehsig	1b7dc7c0c4	next try	2018-09-03 22:59:19 +02:00
Robert Muehsig	c9d53d2fc1	draft	2018-08-30 21:54:42 +02:00
Robert Muehsig	e305029563	Update .travis.yml	2018-07-24 22:44:08 +02:00
Robert Muehsig	da643149bc	Update .travis.yml	2018-07-24 22:42:09 +02:00
Robert Muehsig	c2d4821882	Update .travis.yml	2018-07-24 22:33:18 +02:00
Gregor Biswanger	344c5b7c13	packages update to Electron 2.0.5	2018-07-22 21:44:47 +02:00
Gregor Biswanger	dcd637ae0f	fix migration problems	2018-07-22 21:35:44 +02:00
Gregor Biswanger	f832143135	Merge pull request #154 from manne/patch-1 uses correct project home url	2018-07-22 18:29:48 +02:00
Manuel Pfemeter	dc40a0ed9a	uses correct project home url	2018-07-22 17:50:25 +02:00
Gregor Biswanger	3d65136337	Merge pull request #139 from deinok/updated-electron-version Electron 2.0.2	2018-07-22 17:47:14 +02:00
Gregor Biswanger	b53442be89	Merge pull request #107 from ru-sh/master WebContent.GetUrl() and LoadURLOptions.ExtraHeaders	2018-07-22 17:46:43 +02:00
Gregor Biswanger	a708ccfc22	Merge pull request #101 from ElectronNET/better-cwd https://github.com/ElectronNET/Electron.NET/issues/72	2018-07-22 17:46:14 +02:00
Gregor Biswanger	65399c23fd	Merge pull request #95 from mojinxun/master fix: socket.connnect JS : Scope & Closures	2018-07-22 17:45:35 +02:00
yaofeng	85127be49e	config	2018-07-16 14:07:51 +08:00
yaofeng	86aae5ee18	finish pack check	2018-07-14 15:55:09 +08:00
yaofeng	fcbefa62ca	中文问题编码	2018-07-14 13:50:45 +08:00
yaofeng	e7a9ee07e0	update manifestFile setting	2018-06-14 13:11:42 +08:00
yaofeng	8e38c1f79d	add makeSingleInstance	2018-06-14 10:47:08 +08:00
yaofeng	a874243c9d	loadingWindow add devTools	2018-06-13 15:12:41 +08:00
yaofeng	354b4f09e6	add loadingWindow	2018-06-13 15:03:12 +08:00
Raul Hidalgo Caballero	ff12da19f1	Electron 2.0.2	2018-06-06 16:57:38 +02:00
yaofeng	1bf274a73c	1. getWindowById(id) add undefined check 2. IpcMain add off	2018-05-31 11:05:36 +08:00
yaofeng	949741d992	getWindowById(id) add undefined check	2018-05-30 15:13:17 +08:00
yaofeng	e3eee0c32f	1	2018-05-30 10:38:41 +08:00
yaofeng	ef1f0ab330	registerIpcMainChannel remove channel	2018-05-07 17:18:17 +08:00
Robert Muehsig	5a676cb76a	Merge pull request #123 from tomkerkhove/patch-1 Fix typo	2018-05-07 09:00:45 +02:00
Tom Kerkhove	44797e054c	Fix typo	2018-05-07 08:07:04 +02:00
Robert Muehsig	11641c9424	Merge pull request #119 from 80er/master added support for linux-arm platform	2018-04-19 21:57:18 +02:00
Marco Achtziger	c8254e2d84	added support for linux-arm platform	2018-04-19 21:14:00 +02:00
yaofeng	0997291484	fix: possible eventemitter memory leak delected do: io.setMaxListeners(0);	2018-04-18 16:53:34 +08:00
Shakirov Ruslan	959def9c86	+ WebContent.GetUrl() + LoadURLOptions.ExtraHeaders	2018-03-16 22:32:56 +03:00
yaofeng	e20dafbb66	resume csproj	2018-02-28 10:27:00 +08:00
Robert Muehsig	2e87bb3955	https://github.com/ElectronNET/Electron.NET/issues/72	2018-02-19 23:30:13 +01:00
Robert Muehsig	c4c0bbadea	Update README.md	2018-02-19 23:11:12 +01:00
Robert Muehsig	12b46a9a48	Update README.md	2018-02-19 22:32:44 +01:00
Robert Muehsig	20e2220a8c	0.0.9	2018-02-19 22:21:07 +01:00
Robert Muehsig	041e2942ff	documentation	2018-02-19 22:07:07 +01:00
Robert Muehsig	98e9bcdcd7	Merge pull request #100 from ElectronNET/params Params	2018-02-19 21:22:08 +01:00
Robert Muehsig	eee2a3e34d	Update buildAll.sh	2018-02-14 20:58:06 +01:00
Robert Muehsig	3137d58ba8	Merge pull request #97 from JobGetabu/patch-1 Grammer Changes	2018-02-14 20:51:42 +01:00
Robert Muehsig	293980c0d1	test with quotes	2018-02-14 20:51:15 +01:00
Job Getabu	8420d282bb	Grammer Changes line 6 :)	2018-02-14 22:46:01 +03:00
Robert Muehsig	cbb7a5bc4a	test	2018-02-12 21:38:18 +01:00
Robert Muehsig	2aba2a498e	fix	2018-02-12 21:23:23 +01:00
Robert Muehsig	a2ab76d18d	electron arch and co	2018-02-12 21:17:40 +01:00
Robert Muehsig	d01d82ffec	custom target testing	2018-02-11 22:33:22 +01:00
Robert Muehsig	92087bc3c8	fix usage	2018-02-11 22:28:00 +01:00
Robert Muehsig	a1aaabd588	test target stuff	2018-02-11 22:24:12 +01:00
yaofeng	ad20230b20	Merge branch 'master' of https://github.com/mojinxun/Electron.NET	2018-02-09 23:22:28 +08:00
yaofeng	3ba46a3565	1	2018-02-09 23:22:03 +08:00
mojinxun	53c591f7b7	Merge pull request #1 from ElectronNET/master fix: io.reconnect socket Closure	2018-02-09 23:16:20 +08:00
Robert Muehsig	e4d03eed39	build fix	2018-01-24 22:44:27 +01:00
Robert Muehsig	e1fa8990ef	wip	2018-01-24 22:39:46 +01:00
Gregor Biswanger	331ebb3d7f	update to the new electron version	2018-01-23 23:41:15 +01:00
Gregor Biswanger	c8aec57f31	Merge pull request #54 from danielmarbach/cancellation App cancellation token	2018-01-23 23:04:21 +01:00
Robert Muehsig	27e57f7fa1	Merge pull request #60 from yoDon/master Add list of Starter Kits to ReadMe	2018-01-18 18:04:35 +01:00
Robert Muehsig	25182f98bf	Merge pull request #73 from z1c0/patch-1 Update README.md	2018-01-18 18:03:36 +01:00
Wolfgang Ziegler	2461bcbd72	Update README.md Fixed typo	2017-12-07 09:05:06 +01:00
Don Alvarez	8315153064	Add link in Readme to underlying Electron issue preventing macOS builds from being produced on Windows machines	2017-11-24 16:26:14 -08:00
danielmarbach	fc5250468e	App cancellation token	2017-11-20 21:27:03 +01:00
Don Alvarez	f059ba80b4	Add list of Starter Kits to ReadMe	2017-11-15 16:00:34 -08:00
Robert Muehsig	200f511940	https://github.com/ElectronNET/Electron.NET/issues/52	2017-11-16 00:05:37 +01:00
Robert Muehsig	1f83a8d7ab	typo	2017-11-15 23:43:39 +01:00
Robert Muehsig	5c14e585cf	fix https://github.com/ElectronNET/Electron.NET/issues/52	2017-11-15 23:42:15 +01:00
Robert Muehsig	d1b42fa007	fix for #51	2017-11-15 22:58:33 +01:00
Robert Muehsig	861477c24d	Merge pull request #57 from ElectronNET/tebeco-run_dll_extension_using_cli BuildAll sh/cmd changes	2017-11-14 22:52:20 +01:00
Robert Muehsig	8c91c17656	remove cd in sh	2017-11-14 22:45:09 +01:00
Robert Muehsig	652cc60f6b	typooooo	2017-11-14 22:35:42 +01:00
Robert Muehsig	4ba247d77c	hrm	2017-11-14 22:27:58 +01:00
Robert Muehsig	220b4b290d	shell test	2017-11-14 22:23:19 +01:00
Robert Muehsig	4bccbdf61d	test	2017-11-14 22:13:15 +01:00
Robert Muehsig	e9e723eeae	Merge pull request #56 from tebeco/run_dll_extension_using_cli fix: run CLI dll extension using dotnet cli	2017-11-14 22:08:05 +01:00
Robert Muehsig	e6cb429ecb	changes	2017-11-14 22:06:33 +01:00
TeBeCo	5316e1e2b8	fix: run CLI dll extension usingn dotnet cli	2017-11-14 13:39:42 +01:00
Robert Muehsig	189c4df46e	Merge pull request #53 from ckrausko/ckrausko-patch-1 Grammatical error	2017-11-13 13:36:42 +01:00
Cody Krauskopf	11fd7a74a4	Grammatical error Fixed a grammatical error in the readme	2017-11-13 07:28:18 -05:00
Gregor Biswanger	8bbc951ed1	Update README.md	2017-11-10 03:25:28 +01:00
Gregor Biswanger	ca382bf605	implement PreventDefault function for stop quiting application	2017-11-10 03:11:13 +01:00
Gregor Biswanger	531446f38d	update demo code	2017-11-10 02:12:13 +01:00
Gregor Biswanger	fdb026c7bd	fix app quit event bugs	2017-11-10 01:48:06 +01:00