Merge pull request #425 from konstantingross/feature/Fix_Dock_API

Fix Dock API/ Electron 9.0.1 Update / ...
ElectronNET · Jun 2, 2020 · 380441c · 380441c
2 parents db7a5ff + a66375e
commit 380441c
Show file tree

Hide file tree

Showing 7 changed files with 758 additions and 34 deletions.
diff --git a/ElectronNET.CLI/Commands/Actions/DeployEmbeddedElectronFiles.cs b/ElectronNET.CLI/Commands/Actions/DeployEmbeddedElectronFiles.cs
@@ -20,6 +20,7 @@ public static void Do(string tempPath)
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "browserWindows.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "commandLine.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "dialog.js", "api.");
+            EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "dock.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "menu.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "notification.js", "api.");
             EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "tray.js", "api.");

diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs
@@ -186,7 +186,7 @@ public Task<bool> ExecuteAsync()
                 ProcessHelper.CmdExecute($"node build-helper.js " + manifestFileName, tempPath);
 
                 Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
-                ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.0 {electronParams}", tempPath);
+                ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.1 {electronParams}", tempPath);
 
                 Console.WriteLine("... done");
 

diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj
@@ -61,6 +61,7 @@
     <EmbeddedResource Include="..\ElectronNET.Host\api\browserWindows.js" Link="ElectronHost\api\browserWindows.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\commandLine.js" Link="ElectronHost\api\commandLine.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\dialog.js" Link="ElectronHost\api\dialog.js" />
+    <EmbeddedResource Include="..\ElectronNET.Host\api\dock.js" Link="ElectronHost\api\dock.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\menu.js" Link="ElectronHost\api\menu.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\notification.js" Link="ElectronHost\api\notification.js" />
     <EmbeddedResource Include="..\ElectronNET.Host\api\tray.js" Link="ElectronHost\api\tray.js" />

diff --git a/ElectronNET.Host/package-lock.json b/ElectronNET.Host/package-lock.json
diff --git a/ElectronNET.Host/package.json b/ElectronNET.Host/package.json
@@ -21,7 +21,7 @@
     "devDependencies": {
         "@types/node": "^10.14.4",
         "@types/socket.io": "^2.1.2",
-        "electron": "^9.0.0",
+        "electron": "^9.0.1",
         "tslint": "^6.1.1",
         "typescript": "^3.8.3"
     }