Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
916eecf
Merge branch 'bug/578'
theolivenbaum Jun 28, 2021
d188baa
Merge remote-tracking branch 'MiniguyBrendan/master'
theolivenbaum Jun 28, 2021
1a6d50d
Set up CI with Azure Pipelines
theolivenbaum Jun 28, 2021
f08711e
Fix variables
theolivenbaum Jun 28, 2021
94b5faa
add publish to nuget
theolivenbaum Jun 28, 2021
468a4fa
fix package name
theolivenbaum Jun 28, 2021
505a5b2
fix NPM install
theolivenbaum Jun 28, 2021
bcbe762
Add option to set electron version
theolivenbaum Jun 28, 2021
3b7b592
fix name on resource path
theolivenbaum Jun 28, 2021
2f3d2c0
print all resource names
theolivenbaum Jun 28, 2021
09cb7a6
Update EmbeddedFileHelper.cs
theolivenbaum Jun 28, 2021
d8ba9d9
change assembly name
theolivenbaum Jun 28, 2021
f785734
fix strange issue with capitalization of assembly name
theolivenbaum Jun 28, 2021
8f5a785
use new Electron 12 default values
theolivenbaum Jun 28, 2021
6dee083
Merge remote-tracking branch 'upstream/master'
theolivenbaum Jul 12, 2021
83fd5a5
Add manual initialization methods
theolivenbaum Jul 12, 2021
f07f2e9
Update build-nuget.yaml
theolivenbaum Jul 12, 2021
82755e3
Add comments
theolivenbaum Jul 12, 2021
f200013
add custom property handle for electronize start command
theolivenbaum Jul 12, 2021
8880e04
remove remaining .Result calls
theolivenbaum Jul 12, 2021
126d39f
wip
theolivenbaum Jul 12, 2021
95d6147
works
theolivenbaum Jul 12, 2021
e621449
Merge pull request #2 from theolivenbaum/remove-deprecated-socket-lib
theolivenbaum Jul 12, 2021
b03bc7c
Clean-up
theolivenbaum Jul 12, 2021
ec2261f
Remove wrong ReleaseNoteInfo model
theolivenbaum Jul 13, 2021
9107b16
Add prototype from-build-output command
theolivenbaum Jul 13, 2021
c4ff481
add debug option
theolivenbaum Jul 21, 2021
7fe8f6e
fix wrong object initializer
theolivenbaum Jul 21, 2021
237638a
add command for simple build
theolivenbaum Aug 9, 2021
d6b29f7
avoid calling npm install if nothing changed
theolivenbaum Aug 9, 2021
8063f49
run all continuations asyncronously
theolivenbaum Aug 17, 2021
cbe0637
Simplify repeated code with OnResult method, fix race condition with …
theolivenbaum Aug 18, 2021
bd08938
Delete build-nuget.yaml
theolivenbaum Aug 18, 2021
336c3b9
cleanup for merge
theolivenbaum Aug 18, 2021
b708b4b
reset default values
theolivenbaum Aug 18, 2021
b6338ac
log error messages from asp-net process
theolivenbaum Aug 19, 2021
e8e3649
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 19, 2021
b42eba8
Handle non-zero exit codes from ASP.NET process
theolivenbaum Aug 20, 2021
d9a7411
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 20, 2021
133dcd6
Fix exit method
theolivenbaum Aug 20, 2021
8f71480
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 20, 2021
67b59d9
fix quotes
theolivenbaum Aug 20, 2021
9daaebc
Add timeout property for splashscreen
theolivenbaum Aug 20, 2021
a8229f2
add internal method to emit socket events synchronously, and use it f…
theolivenbaum Aug 20, 2021
0aab352
remove yield call
theolivenbaum Aug 20, 2021
ca9bee7
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 20, 2021
444c09f
Update main.js
theolivenbaum Aug 21, 2021
da9d965
Update main.js
theolivenbaum Aug 21, 2021
87d97ef
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 21, 2021
bf48bc8
replace remaining cases with OnResult, fix deserialization of json ob…
theolivenbaum Aug 23, 2021
31094f9
Remove unecessary JsonSerializer settings, fix default serializer
theolivenbaum Aug 23, 2021
8143159
Update ElectronNET.API.csproj
theolivenbaum Aug 23, 2021
0090a7c
fix wrong completed event name
theolivenbaum Aug 23, 2021
f9693ce
handle destroyed windows
theolivenbaum Aug 23, 2021
9a680a4
improve how we handle when window has been destroyed already
theolivenbaum Aug 23, 2021
fdbf718
Update browserWindows.js
theolivenbaum Aug 23, 2021
fb99dbd
add null return to avoid having to check for undefined
theolivenbaum Aug 23, 2021
953f1e2
fix event names for when there are more than one window, view or webc…
theolivenbaum Aug 24, 2021
0393b0b
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 24, 2021
ac77643
add variable to control kill behaviour
theolivenbaum Aug 25, 2021
94efaf8
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Aug 25, 2021
bad5946
pass electron process id to child
theolivenbaum Aug 25, 2021
67c592a
kill child process when electronize cli is killed
theolivenbaum Aug 25, 2021
e39e342
Update ProcessHelper.cs
theolivenbaum Aug 25, 2021
8bbe6a9
Fix serialization of array of objects
theolivenbaum Aug 25, 2021
144a0a0
change argument name, detach process on creation
theolivenbaum Aug 25, 2021
8b03a6b
remove stdio handling for detached case
theolivenbaum Aug 25, 2021
efec886
Update main.js
theolivenbaum Aug 25, 2021
64b91fc
Update main.js
theolivenbaum Aug 25, 2021
be41cae
Update main.js
theolivenbaum Aug 25, 2021
48d5497
Revert "Update main.js"
theolivenbaum Aug 25, 2021
5e82ae4
add socket events to emit console messages
theolivenbaum Aug 25, 2021
18d425b
Merge branch 'master' into switch-to-new-socket-lib
theolivenbaum Aug 25, 2021
891870a
Merge branch 'master' into switch-to-new-socket-lib
GregorBiswanger Apr 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update main.js
  • Loading branch information
theolivenbaum authored Aug 21, 2021
commit 444c09fb4d13dcb098a8cea547017b81224b93e7
2 changes: 1 addition & 1 deletion ElectronNET.Host/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function startSplashScreen() {
if (manifestJsonFile.hasOwnProperty('splashscreen')) {
if (manifestJsonFile.splashscreen.hasOwnProperty('timeout')) {
var timeout = manifestJsonFile.splashscreen.timeout;
window.setTimeout((t) => {
setTimeout((t) => {
if (splashScreen != null ) {
splashScreen.destroy();
splashScreen = null;
Expand Down