Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
2f02292
fix for socket not being thread-safe
theolivenbaum Aug 26, 2021
44d979f
Use ILogger instead of Console.WriteLine
theolivenbaum Aug 26, 2021
e7c5627
Update BridgeConnector.cs
theolivenbaum Aug 26, 2021
1161f59
Update BridgeConnector.cs
theolivenbaum Aug 26, 2021
81a8367
improve reconnect logic
theolivenbaum Aug 26, 2021
7ad6803
improve reconnect logic by waiting for reconnect before emit
theolivenbaum Aug 26, 2021
224bc1e
Add supported OS platform annotations
theolivenbaum Aug 26, 2021
0728577
missing using
theolivenbaum Aug 26, 2021
efdaf0e
remove defaultvaluehandling setting as this breaks some cases
theolivenbaum Aug 26, 2021
89d41a2
restore serialization settings where it makes sense
theolivenbaum Aug 26, 2021
35b18a9
ignore process closing if going for an update
theolivenbaum Aug 26, 2021
bd45e23
remove recreate behaviour from activate event on mac, and emit event …
theolivenbaum Aug 30, 2021
5ba1013
Add excludedFromShownWindowsMenu and TrafficLightPosition
theolivenbaum Sep 1, 2021
7b5bac2
Fix property assignment
theolivenbaum Sep 1, 2021
548609f
add handler for errors on socket.on calls
theolivenbaum Sep 1, 2021
2d68ca5
Fix LogError call
theolivenbaum Sep 1, 2021
9a938dc
use concurrent dictionary instead of list
theolivenbaum Sep 1, 2021
794248a
fix creation of windows not being thread safe
theolivenbaum Sep 1, 2021
eac1442
Add event handler with sender id
theolivenbaum Sep 1, 2021
1e7ff5b
fix getting id
theolivenbaum Sep 1, 2021
a2579b2
fix wrong Id being passed - needed browser id, not webcontent id
theolivenbaum Sep 1, 2021
ec74c79
Update ipc.js
theolivenbaum Sep 1, 2021
4e7cebe
fix closed behaviour
theolivenbaum Sep 1, 2021
badc9f2
Revert "fix closed behaviour"
theolivenbaum Sep 1, 2021
14ee45b
Another attempt
theolivenbaum Sep 1, 2021
25af4a7
Update to Electron 14
theolivenbaum Sep 2, 2021
5f4b162
fix display serialization, serialize only window id when sending ipc …
theolivenbaum Sep 2, 2021
4fae2ae
fix ipc data serialization
theolivenbaum Sep 2, 2021
c229d49
remove debug message
theolivenbaum Sep 2, 2021
bb8965f
remove semaphore in favor of unique events per window /view create re…
theolivenbaum Sep 2, 2021
47f4516
Add flag to check if the socket is connected
theolivenbaum Sep 2, 2021
d18700f
missing static flag
theolivenbaum Sep 2, 2021
7f5db58
fix deadlock case on emit before any Socket use
theolivenbaum Sep 2, 2021
ea40249
refactor Socket to use a task completion source instead of a getter w…
theolivenbaum Sep 2, 2021
374d92f
don't throw in case the tray was destroyed between calls
theolivenbaum Sep 3, 2021
236c31a
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Sep 3, 2021
bbbc9e6
make splashscreen draggable
theolivenbaum Sep 6, 2021
172f6de
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Sep 6, 2021
a3fb411
always keep default values when creating window
theolivenbaum Sep 6, 2021
9693c82
Add TitleBarOverlay option
theolivenbaum Sep 6, 2021
801616c
Let users set the color of the titlebar instead of just enabling it
theolivenbaum Sep 6, 2021
dc2662e
Add way to set flags for Electron before the app starts
theolivenbaum Sep 7, 2021
a637174
typo
theolivenbaum Sep 7, 2021
6a4a7ef
Workaround for electron freeze bug
theolivenbaum Sep 7, 2021
9be80ab
Add method to destroy splashscreen
theolivenbaum Sep 7, 2021
5559fc6
force-destroy all windows on before-quit-for-update
theolivenbaum Sep 8, 2021
8604b50
Add method to destroy all windows manually
theolivenbaum Sep 8, 2021
67ea8c7
Update BrowserWindow.cs
theolivenbaum Sep 10, 2021
124d24a
Update browserWindows.ts
theolivenbaum Sep 10, 2021
836eebf
Update browserWindows.js
theolivenbaum Sep 10, 2021
adef39f
Change flags to nullable
theolivenbaum Sep 10, 2021
c2904f3
Change second instance activation to raise event instead of trying to…
theolivenbaum Sep 15, 2021
75d7924
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Sep 15, 2021
664d5f7
Add method to get window by id
theolivenbaum Sep 15, 2021
51013d5
code cleanup
theolivenbaum Sep 15, 2021
e1edc76
update electron to 14.0.1
theolivenbaum Sep 16, 2021
e6ea988
code cleanup
theolivenbaum Sep 17, 2021
9a85847
update to net6.0
theolivenbaum Sep 17, 2021
2445b59
Update Electron to v15.0.0
theolivenbaum Sep 22, 2021
21b6b14
Update Node to v16.9.6
theolivenbaum Sep 22, 2021
1d1e60b
Missed updating the nuget package version
theolivenbaum Sep 22, 2021
329df38
Update to Electron 15.1.1
theolivenbaum Oct 7, 2021
c283550
Update build-nuget.yaml
theolivenbaum Oct 7, 2021
228a5ce
set missing return value
theolivenbaum Oct 7, 2021
62003ae
Update BuildCommand.cs
theolivenbaum Oct 11, 2021
7e5903f
update to electron 15.1.2
theolivenbaum Oct 12, 2021
852b140
Update to 15.3.0
theolivenbaum Oct 22, 2021
1e50f20
Add fixPath to fix linux process spawn
theolivenbaum Oct 25, 2021
b5ff42a
Update main.js
theolivenbaum Oct 26, 2021
b5cc631
Revert "Update main.js"
theolivenbaum Oct 26, 2021
22fa3f2
Revert "Add fixPath to fix linux process spawn"
theolivenbaum Oct 26, 2021
f213ca4
move code for fixPath here
theolivenbaum Oct 26, 2021
84f027c
remove listeners on the call to before-quit-for-update
theolivenbaum Oct 26, 2021
1494c2f
Update main.js
theolivenbaum Oct 26, 2021
5ebfa2b
Update main.js
theolivenbaum Oct 26, 2021
ae92973
Update main.js
theolivenbaum Oct 26, 2021
2297669
Update main.js
theolivenbaum Oct 27, 2021
ad46b1a
remove listeners on quitAndInstall to try fix macOS update issue
theolivenbaum Oct 27, 2021
4caa28d
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Oct 27, 2021
316cf01
Update Vibrancy.cs
theolivenbaum Oct 27, 2021
751c48c
Update Vibrancy.cs
theolivenbaum Oct 27, 2021
23791fc
fix path detection
theolivenbaum Oct 29, 2021
134a5b1
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Oct 29, 2021
5477bd7
Add setImmediate to see if this fixes the macOS update bug
theolivenbaum Nov 2, 2021
5bf9aa8
Update main.js
theolivenbaum Nov 2, 2021
a12a7e4
Update main.js
theolivenbaum Nov 3, 2021
606bb01
fix race condition causing unobserved exception
theolivenbaum Nov 5, 2021
bd96765
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Nov 5, 2021
326efd3
Update sdk to 6.0.100
theolivenbaum Nov 9, 2021
2cc6823
Update electron to 15.3.1
theolivenbaum Nov 9, 2021
54c86d9
Fix auto-updater on mac not working
theolivenbaum Nov 10, 2021
be1182d
move .NET bin output to under Helpers folder to be compliant with mac…
theolivenbaum Nov 10, 2021
390135a
Revert "move .NET bin output to under Helpers folder to be compliant …
theolivenbaum Nov 10, 2021
2f9029e
add launch settings to test build
theolivenbaum Nov 10, 2021
cbac854
Add transparent option to webpreferences
theolivenbaum Nov 13, 2021
cbc150d
Update to Electron 15.3.2
theolivenbaum Nov 16, 2021
b2f5a0e
Update to Electron 16
theolivenbaum Nov 16, 2021
067300b
update nuget packages
theolivenbaum Nov 16, 2021
4405eba
Add support for dark mode splashscreen
theolivenbaum Nov 17, 2021
9aad724
Update electron to 16.0.1
theolivenbaum Nov 18, 2021
ffedbcc
Add missing GetFileIcon method
theolivenbaum Nov 20, 2021
af04109
update screenshot code
theolivenbaum Nov 22, 2021
b1c5c12
fix null usage on ipc.js
theolivenbaum Nov 22, 2021
1b7f722
Update Electron to 16.0.2, update electron-updater to 4.6.1
theolivenbaum Nov 25, 2021
2d940db
update to electron 16.0.4
theolivenbaum Dec 3, 2021
b5e2b66
Add Image to clipboard data
pfriesch Dec 9, 2021
f5a141a
Update ElectronNET.API.csproj
theolivenbaum Dec 9, 2021
a28df53
Merge pull request #3 from pfriesch/patch-1
theolivenbaum Dec 9, 2021
4118756
change socket connect loop
theolivenbaum Dec 13, 2021
8f820d0
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Dec 13, 2021
427592d
Add background thread to reconnect socket
theolivenbaum Dec 13, 2021
3460217
refactor socket reconnect
theolivenbaum Dec 13, 2021
6be3019
fix typescript, based on changes to js
pfriesch Dec 13, 2021
17a7886
formatting
pfriesch Dec 13, 2021
82bf94b
fix writing images to clipboard when writing multiple formats
pfriesch Dec 13, 2021
4a3a5c6
Merge pull request #4 from theolivenbaum/clipboard
theolivenbaum Dec 13, 2021
8cb2355
Change again socket reconnect logic
theolivenbaum Dec 15, 2021
159c1f4
add support for images in clipboards on macos
pfriesch Dec 15, 2021
21427f0
Merge pull request #5 from theolivenbaum/clipboard-image-support-macos
theolivenbaum Dec 15, 2021
88e8051
update electron and electron updater
theolivenbaum Dec 17, 2021
546c617
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Dec 17, 2021
f229d54
Add simple socket auth via stdin exchange
theolivenbaum Dec 23, 2021
36751db
fix missing pipe option for detached process
theolivenbaum Dec 23, 2021
ed84155
always exit if .net process exited
theolivenbaum Dec 23, 2021
4358178
Add support for DesktopCapturer
theolivenbaum Dec 26, 2021
291faa4
Missing including new file
theolivenbaum Dec 26, 2021
060fb19
Update NativeImageJsonConverter.cs
theolivenbaum Dec 26, 2021
9e37d4d
fix serializtion
theolivenbaum Dec 26, 2021
d646b84
update 16.0.7
theolivenbaum Jan 13, 2022
93ee187
update electron to 16.0.8
theolivenbaum Jan 30, 2022
13a3753
emit prepare-for-update
theolivenbaum Feb 9, 2022
c855204
Add debug messages for update methods
theolivenbaum Feb 9, 2022
56fe57d
Update to 17.0.0
theolivenbaum Feb 10, 2022
26ba398
Add new WCO height option
theolivenbaum Feb 10, 2022
40eae5a
update to 17.0.1
theolivenbaum Feb 15, 2022
8067f8e
Update to 17.1.0, remove soon to be deprecated nativeWindowOpen optiojn
theolivenbaum Mar 3, 2022
7f282c1
Update to 17.1.1
theolivenbaum Mar 7, 2022
8f26cee
update socket.io
theolivenbaum Mar 7, 2022
a5bb3ad
Update ElectronNET.API.csproj
theolivenbaum Mar 7, 2022
df15d24
Update to 17.1.2
theolivenbaum Mar 10, 2022
967ccf3
Add support for random port assignment
theolivenbaum Mar 22, 2022
13edd4c
fix multi thread usage missing lock
theolivenbaum Mar 23, 2022
b58b457
Add dotenv and electron-notarize dependencies
theolivenbaum Mar 24, 2022
ef13ec9
update electron to 17.2.0
theolivenbaum Mar 24, 2022
606b2a6
Update main.js
theolivenbaum Mar 24, 2022
9c89711
Import SocketIOClient code until next version is released
theolivenbaum Mar 25, 2022
e643d0d
Update
theolivenbaum Mar 25, 2022
6ca5563
Update build-nuget.yaml for Azure Pipelines
theolivenbaum Mar 25, 2022
93f1875
remove again SocketIOClient as package was updated
theolivenbaum Mar 25, 2022
b7196ff
Merge branch 'master' of https://github.com/theolivenbaum/Electron.NET
theolivenbaum Mar 25, 2022
0ffecd5
save projects
theolivenbaum Mar 25, 2022
b0262b3
Update electron to 17.3.0
theolivenbaum Mar 29, 2022
de56395
Update to Electron 18.0.0
theolivenbaum Mar 29, 2022
c45ea53
Update to Electron 18.0.1
theolivenbaum Apr 1, 2022
e3fbce2
Remove default electron version parameter from CLI
theolivenbaum Apr 1, 2022
793f714
Publish Electron 17.3.1
theolivenbaum Apr 1, 2022
0632112
improve build command to try to read version from xml file
theolivenbaum Apr 1, 2022
f05934a
Forgot to roll back to 18.0.1
theolivenbaum Apr 1, 2022
ec12dbd
Update electron to 18.0.2
theolivenbaum Apr 5, 2022
d929102
update to Electron 18.0.3
theolivenbaum Apr 10, 2022
339a319
fix race condition on electron socket initialization
theolivenbaum Apr 11, 2022
9b881b1
Roll back to electron 18.0.2
theolivenbaum Apr 12, 2022
3f8766f
Build 17.4.0
theolivenbaum Apr 12, 2022
6675571
handle fail on getdisplaymatching
theolivenbaum Apr 13, 2022
d6c9875
handle also get nearest point
theolivenbaum Apr 13, 2022
3a24b69
let user define own env variables to start
theolivenbaum Apr 20, 2022
d863ff9
update to 18.0.4
theolivenbaum Apr 20, 2022
87468cc
Update main.js
theolivenbaum Apr 20, 2022
4308f2c
Electron Release 17.4.1
theolivenbaum Apr 21, 2022
4f9b46c
Electron Release 18.1.0
theolivenbaum Apr 21, 2022
d910eec
Add releaser helper to automate updating versions
theolivenbaum Apr 21, 2022
4d5d672
Check if version exists
theolivenbaum Apr 21, 2022
48a0d68
Increase max message size to 100mb
theolivenbaum Apr 23, 2022
e245d0d
release also for 17.4.1
theolivenbaum Apr 23, 2022
a00a8a0
Release 18.3.0
theolivenbaum May 24, 2022
3ea7e96
Release 19.0.1
theolivenbaum May 27, 2022
a1a5f6f
Handle case where pipe breaks showing error message
theolivenbaum May 31, 2022
252ab50
Release 18.3.2
theolivenbaum Jun 2, 2022
89833f4
Release 19.0.2
theolivenbaum Jun 2, 2022
79ce1c4
Release 19.0.3
theolivenbaum Jun 8, 2022
ff05ef2
Release 19.0.4
theolivenbaum Jun 8, 2022
e0000f7
Change to use ImageSharp
theolivenbaum Jun 8, 2022
4906bab
Change to use ImageSharp
theolivenbaum Jun 8, 2022
68c9e80
merge #673
theolivenbaum Jun 9, 2022
5761404
merge #624
theolivenbaum Jun 9, 2022
1f22be6
Drop net5.0
theolivenbaum Jun 9, 2022
2f73bb8
Release 19.0.5
theolivenbaum Jun 21, 2022
c8f944a
Release 19.0.6
theolivenbaum Jun 27, 2022
b7ed3d2
Update main.js
theolivenbaum Jun 27, 2022
a19e095
Fix wrong variable name
theolivenbaum Jun 27, 2022
e1c5b7e
Update main.js
theolivenbaum Jun 28, 2022
7333018
Release 19.0.8
theolivenbaum Jul 12, 2022
e2615a8
Import SocketIO code
theolivenbaum Jul 14, 2022
90b4a28
Add experimental mode to start electron from C# (for development purp…
theolivenbaum Jul 14, 2022
89033c6
Return socket port
theolivenbaum Jul 14, 2022
a5bc910
Release 19.0.9
theolivenbaum Jul 22, 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
5 changes: 3 additions & 2 deletions .devops/build-nuget.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
PackageVersion: 13.5.1.$(Build.BuildId)
PackageVersion: 19.0.9.$(Build.BuildId)
projectAPI: './ElectronNET.API/ElectronNET.API.csproj'
projectCLI: './ElectronNET.CLI/ElectronNET.CLI.csproj'

Expand All @@ -20,7 +20,7 @@ steps:
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 5.0.203
version: 6.0.100
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: DotNetCoreCLI@2
Expand Down Expand Up @@ -55,6 +55,7 @@ steps:
configuration: 'Release'
versioningScheme: 'off'
buildProperties: 'Version=$(PackageVersion)'
arguments: -IncludeReferencedProjects

- task: DotNetCoreCLI@2
inputs:
Expand Down
171 changes: 165 additions & 6 deletions ElectronNET.API/App.cs

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ElectronNET.API/AutoUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public event Action<UpdateInfo> OnUpdateDownloaded
private event Action<UpdateInfo> _updateDownloaded;

private static AutoUpdater _autoUpdater;
private static object _syncRoot = new object();
private static readonly object _syncRoot = new();

internal AutoUpdater() { }

Expand Down Expand Up @@ -426,6 +426,7 @@ public Task<UpdateCheckResult> CheckForUpdatesAndNotifyAsync()
/// <param name="isForceRunAfter">Run the app after finish even on silent install. Not applicable for macOS. Ignored if `isSilent` is set to `false`.</param>
public void QuitAndInstall(bool isSilent = false, bool isForceRunAfter = false)
{
BridgeConnector.EmitSync("prepare-for-update");
BridgeConnector.EmitSync("autoUpdaterQuitAndInstall", isSilent, isForceRunAfter);
}

Expand Down
Loading