From c343b19a60d299a8a580823410141502403523ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 21:16:04 +0000 Subject: [PATCH 1/2] Bump lodash from 4.17.11 to 4.17.15 in /ElectronNET.Host Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15) Signed-off-by: dependabot[bot] --- ElectronNET.Host/package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ElectronNET.Host/package-lock.json b/ElectronNET.Host/package-lock.json index 165e6f5..21bebd3 100644 --- a/ElectronNET.Host/package-lock.json +++ b/ElectronNET.Host/package-lock.json @@ -1047,9 +1047,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.isequal": { "version": "4.5.0", @@ -1772,7 +1772,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, From 6fbba52edd49de8d1832a1e949832bb88d25d661 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Mon, 14 Oct 2019 11:13:53 +0300 Subject: [PATCH 2/2] Fix `buildAll.cmd` and `buildAll.sh` when running on clear repo This is followup to c91884a5203c8f1f14c7320595126b1bbe60f68e change which on itself was reaction to electron-builder changes in the command line parameters interface --- buildAll.cmd | 6 +++--- buildAll.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildAll.cmd b/buildAll.cmd index b546cab..712166c 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -22,7 +22,7 @@ dotnet tool uninstall ElectronNET.CLI -g dotnet tool install ElectronNET.CLI -g echo "/target xxx (dev-build)" -electronize build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32 /electron-params "--prune=true " +electronize build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params "--prune=true " echo "/target win (dev-build)" electronize build /target win @@ -30,8 +30,8 @@ electronize build /target win echo "/target linux (dev-build)" electronize build /target linux -echo "/target custom win7-x86;win32 (dev-build)" -electronize build /target custom win7-x86;win32 +echo "/target custom win7-x86;win (dev-build)" +electronize build /target custom win7-x86;win :: Be aware, that for non-electronnet-dev environments the correct diff --git a/buildAll.sh b/buildAll.sh index 20823ce..3d586ad 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -32,8 +32,8 @@ electronize build /target linux echo "/target osx (dev-build)" electronize build /target osx -echo "/target custom win7-x86;win32 (dev-build)" -electronize build /target custom "win7-x86;win32" +echo "/target custom win7-x86;win (dev-build)" +electronize build /target custom "win7-x86;win" # Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ...