starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-09 02:07:47 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Fixed bug: Build fails with latest electron-builder version - #288

Browse Source
This commit is contained in:
Gregor Biswanger
2019-07-26 16:31:44 +02:00
parent ccf0a4c73b
commit c91884a520
6 changed files with 1991 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Changelog.md
View File

@@ -4,29 +4,29 @@
ElectronNET.CLI: ElectronNET.CLI:
* Fixed bug: Electron tray icon TypeError ([Electron original issue](https://github.com/electron/electron/issues/7657)) * Fixed bug: Build fails with latest electron-builder version [\#288](https://github.com/ElectronNET/Electron.NET/issues/288)
* Fixed bug: Wrong tray icon path in the application built via `electronize build` command
ElectronNET.API:
* Fixed bug: Electron tray icon TypeError ([Electron original issue](https://github.com/electron/electron/issues/7657)) (thanks [Tum4ik](https://github.com/Tum4ik))
* Fixed bug: Wrong tray icon path in the application built via `electronize build` command (thanks [Tum4ik](https://github.com/Tum4ik))
* 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))
ElectronNET.WebApp: ElectronNET.WebApp:
* Fixed usage of the `Electron.Tray.Show` according fixed bugs in the ElectronNET.CLI * Fixed usage of the `Electron.Tray.Show` according fixed bugs in the ElectronNET.CLI (thanks [Tum4ik](https://github.com/Tum4ik))
# Released # Released
# 5.22.13 # 5.22.13
ElectronNET.CLI:
ElectronNET.API: ElectronNET.API:
* Fixed bug: Menu Item visibility [\#257](https://github.com/ElectronNET/Electron.NET/issues/257) * Fixed bug: Menu Item visibility [\#257](https://github.com/ElectronNET/Electron.NET/issues/257)
* Fixed bug: electron.manifest.json - singleInstance not working [\#258](https://github.com/ElectronNET/Electron.NET/issues/258) * Fixed bug: electron.manifest.json - singleInstance not working [\#258](https://github.com/ElectronNET/Electron.NET/issues/258)
* 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) * 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)
ElectronNET.WebApp:
# 5.22.12 # 5.22.12
ElectronNET.CLI: ElectronNET.CLI:

8
ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs
View File

@@ -21,11 +21,11 @@ namespace ElectronNET.CLI.Commands.Actions
{ {
case "win": case "win":
netCorePublishRid = "win-x64"; netCorePublishRid = "win-x64";
electronPackerPlatform = "win32"; electronPackerPlatform = "win";
break; break;
case "osx": case "osx":
netCorePublishRid = "osx-x64"; netCorePublishRid = "osx-x64";
electronPackerPlatform = "darwin"; electronPackerPlatform = "mac";
break; break;
case "linux": case "linux":
netCorePublishRid = "linux-x64"; netCorePublishRid = "linux-x64";
@@ -44,12 +44,12 @@ namespace ElectronNET.CLI.Commands.Actions
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
netCorePublishRid = $"win-x{(Environment.Is64BitOperatingSystem ? "64" : "86")}"; netCorePublishRid = $"win-x{(Environment.Is64BitOperatingSystem ? "64" : "86")}";
electronPackerPlatform = "win32"; electronPackerPlatform = "win";
} }
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
netCorePublishRid = "osx-x64"; netCorePublishRid = "osx-x64";
electronPackerPlatform = "darwin"; electronPackerPlatform = "mac";
} }
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{ {

4
ElectronNET.CLI/Commands/BuildCommand.cs
View File

@@ -154,8 +154,6 @@ namespace ElectronNET.CLI.Commands
Console.WriteLine("Executing electron magic in this directory: " + buildPath); Console.WriteLine("Executing electron magic in this directory: " + buildPath);
// ToDo: Need a solution for --asar support
string electronArch = "x64"; string electronArch = "x64";
if (parser.Arguments.ContainsKey(_paramElectronArch)) if (parser.Arguments.ContainsKey(_paramElectronArch))
{ {
@@ -173,7 +171,7 @@ namespace ElectronNET.CLI.Commands
ProcessHelper.CmdExecute($"node build-helper.js", tempPath); ProcessHelper.CmdExecute($"node build-helper.js", tempPath);
Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}..."); Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
ProcessHelper.CmdExecute($"electron-builder . --config=./bin/electron-builder.json --platform={platformInfo.ElectronPackerPlatform} --arch={electronArch} {electronParams}", tempPath); ProcessHelper.CmdExecute($"electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=5.0.8 {electronParams}", tempPath);
Console.WriteLine("... done"); Console.WriteLine("... done");

1976
ElectronNET.Host/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
ElectronNET.Host/package.json
View File

@@ -22,6 +22,6 @@
"@types/socket.io": "^2.1.2", "@types/socket.io": "^2.1.2",
"tslint": "^5.12.0", "tslint": "^5.12.0",
"typescript": "^3.2.2", "typescript": "^3.2.2",
"electron": "^5.0.1" "electron": "^5.0.8"
} }
} }

2
ElectronNET.WebApp/Properties/launchSettings.json
View File

@@ -28,6 +28,6 @@
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:50395/" "applicationUrl": "http://localhost:50395/"
}, }
} }
} }