Skip to content

Commit c91884a

Browse files
Fixed bug: Build fails with latest electron-builder version - #288
1 parent ccf0a4c commit c91884a

File tree

6 files changed

+1991
-17
lines changed

6 files changed

+1991
-17
lines changed

Changelog.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44

55
ElectronNET.CLI:
66

7-
* Fixed bug: Electron tray icon TypeError ([Electron original issue](https://github.com/electron/electron/issues/7657))
8-
* Fixed bug: Wrong tray icon path in the application built via `electronize build` command
7+
* Fixed bug: Build fails with latest electron-builder version [\#288](https://github.com/ElectronNET/Electron.NET/issues/288)
8+
9+
ElectronNET.API:
10+
11+
* Fixed bug: Electron tray icon TypeError ([Electron original issue](https://github.com/electron/electron/issues/7657)) (thanks [Tum4ik](https://github.com/Tum4ik))
12+
* Fixed bug: Wrong tray icon path in the application built via `electronize build` command (thanks [Tum4ik](https://github.com/Tum4ik))
13+
* Fixed bug: fix async issue where same port is considered open [\#261](https://github.com/ElectronNET/Electron.NET/issues/261) (thanks [netpoetica](https://github.com/netpoetica))
914

1015
ElectronNET.WebApp:
1116

12-
* Fixed usage of the `Electron.Tray.Show` according fixed bugs in the ElectronNET.CLI
17+
* Fixed usage of the `Electron.Tray.Show` according fixed bugs in the ElectronNET.CLI (thanks [Tum4ik](https://github.com/Tum4ik))
1318

1419

1520
# Released
1621

1722
# 5.22.13
1823

19-
ElectronNET.CLI:
20-
2124
ElectronNET.API:
2225

2326
* Fixed bug: Menu Item visibility [\#257](https://github.com/ElectronNET/Electron.NET/issues/257)
2427
* Fixed bug: electron.manifest.json - singleInstance not working [\#258](https://github.com/ElectronNET/Electron.NET/issues/258)
2528
* Fixed security issue: ASP.NET Core process is now bound to 127.0.0.1 instead of the broader localhost [\#258](https://github.com/ElectronNET/Electron.NET/pull/266)
2629

27-
ElectronNET.WebApp:
28-
29-
3030
# 5.22.12
3131

3232
ElectronNET.CLI:

ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public static GetTargetPlatformInformationResult Do(string desiredPlatform, stri
2121
{
2222
case "win":
2323
netCorePublishRid = "win-x64";
24-
electronPackerPlatform = "win32";
24+
electronPackerPlatform = "win";
2525
break;
2626
case "osx":
2727
netCorePublishRid = "osx-x64";
28-
electronPackerPlatform = "darwin";
28+
electronPackerPlatform = "mac";
2929
break;
3030
case "linux":
3131
netCorePublishRid = "linux-x64";
@@ -44,12 +44,12 @@ public static GetTargetPlatformInformationResult Do(string desiredPlatform, stri
4444
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
4545
{
4646
netCorePublishRid = $"win-x{(Environment.Is64BitOperatingSystem ? "64" : "86")}";
47-
electronPackerPlatform = "win32";
47+
electronPackerPlatform = "win";
4848
}
4949
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
5050
{
5151
netCorePublishRid = "osx-x64";
52-
electronPackerPlatform = "darwin";
52+
electronPackerPlatform = "mac";
5353
}
5454
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
5555
{

ElectronNET.CLI/Commands/BuildCommand.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ public Task<bool> ExecuteAsync()
154154

155155
Console.WriteLine("Executing electron magic in this directory: " + buildPath);
156156

157-
// ToDo: Need a solution for --asar support
158-
159157
string electronArch = "x64";
160158
if (parser.Arguments.ContainsKey(_paramElectronArch))
161159
{
@@ -173,7 +171,7 @@ public Task<bool> ExecuteAsync()
173171
ProcessHelper.CmdExecute($"node build-helper.js", tempPath);
174172

175173
Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
176-
ProcessHelper.CmdExecute($"electron-builder . --config=./bin/electron-builder.json --platform={platformInfo.ElectronPackerPlatform} --arch={electronArch} {electronParams}", tempPath);
174+
ProcessHelper.CmdExecute($"electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=5.0.8 {electronParams}", tempPath);
177175

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

0 commit comments

Comments
 (0)