From 390135af8ae3b1fc553e41cd42e41241103d8cdd Mon Sep 17 00:00:00 2001 From: rafael-aero Date: Wed, 10 Nov 2021 11:06:40 +0100 Subject: [PATCH] Revert "move .NET bin output to under Helpers folder to be compliant with macOS bundle formt " This reverts commit be1182d3025e3fff653fc80d9db6a06078148539. --- ElectronNET.Host/electron.manifest.json | 10 +++++----- ElectronNET.Host/main.js | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ElectronNET.Host/electron.manifest.json b/ElectronNET.Host/electron.manifest.json index c28d4a6..014fdec 100644 --- a/ElectronNET.Host/electron.manifest.json +++ b/ElectronNET.Host/electron.manifest.json @@ -17,6 +17,11 @@ "output": "../../../bin/Desktop" }, "extraResources": [ + { + "from": "./bin", + "to": "bin", + "filter": [ "**/*" ] + } ], "files": [ { @@ -24,11 +29,6 @@ "to": "ElectronHostHook/node_modules", "filter": [ "**/*" ] }, - { - "from": "./bin", - "to": "Helpers/bin", - "filter": [ "**/*" ] - }, "**/*" ] } diff --git a/ElectronNET.Host/main.js b/ElectronNET.Host/main.js index 754ba60..2826576 100644 --- a/ElectronNET.Host/main.js +++ b/ElectronNET.Host/main.js @@ -32,8 +32,7 @@ if (app.commandLine.hasSwitch('watch')) { watchable = true; }; -let resourcesPath = __dirname.replace('app.asar', ''); -let currentBinPath = path.join(resourcesPath, '..', 'Helpers', 'bin'); +let currentBinPath = path.join(__dirname.replace('app.asar', ''), 'bin'); let manifestJsonFilePath = path.join(currentBinPath, manifestJsonFileName); // if watch is enabled lets change the path