Skip to content

Commit 380441c

Browse files
Merge pull request #425 from konstantingross/feature/Fix_Dock_API
Fix Dock API/ Electron 9.0.1 Update / ...
2 parents db7a5ff + a66375e commit 380441c

File tree

7 files changed

+758
-34
lines changed

7 files changed

+758
-34
lines changed

ElectronNET.CLI/Commands/Actions/DeployEmbeddedElectronFiles.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public static void Do(string tempPath)
2020
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "browserWindows.js", "api.");
2121
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "commandLine.js", "api.");
2222
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "dialog.js", "api.");
23+
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "dock.js", "api.");
2324
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "menu.js", "api.");
2425
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "notification.js", "api.");
2526
EmbeddedFileHelper.DeployEmbeddedFile(hostApiFolder, "tray.js", "api.");

ElectronNET.CLI/Commands/BuildCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public Task<bool> ExecuteAsync()
186186
ProcessHelper.CmdExecute($"node build-helper.js " + manifestFileName, tempPath);
187187

188188
Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
189-
ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.0 {electronParams}", tempPath);
189+
ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.1 {electronParams}", tempPath);
190190

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

ElectronNET.CLI/ElectronNET.CLI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<EmbeddedResource Include="..\ElectronNET.Host\api\browserWindows.js" Link="ElectronHost\api\browserWindows.js" />
6262
<EmbeddedResource Include="..\ElectronNET.Host\api\commandLine.js" Link="ElectronHost\api\commandLine.js" />
6363
<EmbeddedResource Include="..\ElectronNET.Host\api\dialog.js" Link="ElectronHost\api\dialog.js" />
64+
<EmbeddedResource Include="..\ElectronNET.Host\api\dock.js" Link="ElectronHost\api\dock.js" />
6465
<EmbeddedResource Include="..\ElectronNET.Host\api\menu.js" Link="ElectronHost\api\menu.js" />
6566
<EmbeddedResource Include="..\ElectronNET.Host\api\notification.js" Link="ElectronHost\api\notification.js" />
6667
<EmbeddedResource Include="..\ElectronNET.Host\api\tray.js" Link="ElectronHost\api\tray.js" />

ElectronNET.Host/package-lock.json

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"devDependencies": {
2222
"@types/node": "^10.14.4",
2323
"@types/socket.io": "^2.1.2",
24-
"electron": "^9.0.0",
24+
"electron": "^9.0.1",
2525
"tslint": "^6.1.1",
2626
"typescript": "^3.8.3"
2727
}

0 commit comments

Comments
 (0)