Merge branch 'master' into netcore30

This commit is contained in:
Robert Muehsig
2019-10-15 00:10:14 +02:00
committed by GitHub
3 changed files with 7 additions and 7 deletions

View File

@@ -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
},

View File

@@ -29,8 +29,8 @@ echo "/target win (dev-build)"
electronize build /target win /electron-params "--publish never"
echo "/target custom win7-x86;win (dev-build)"
electronize build /target custom win7-x86;win /electron-params "--publish never"
electronize build /target custom win7-x86;win /electron-params "--publish never"
:: Be aware, that for non-electronnet-dev environments the correct
:: invoke command would be dotnet electronize ...

View File

@@ -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 ...