From 8063f49e4b5715cc6e89013526458fce50c334e7 Mon Sep 17 00:00:00 2001
From: rafael-aero <rafael@rafael.aero>
Date: Tue, 17 Aug 2021 16:28:07 +0200
Subject: [PATCH] run all continuations asyncronously

---
 ElectronNET.API/App.cs            | 44 ++++++++++-----------
 ElectronNET.API/AutoUpdater.cs    | 26 ++++++------
 ElectronNET.API/BrowserView.cs    |  2 +-
 ElectronNET.API/BrowserWindow.cs  | 66 +++++++++++++++----------------
 ElectronNET.API/Clipboard.cs      | 14 +++----
 ElectronNET.API/CommandLine.cs    |  4 +-
 ElectronNET.API/Cookies.cs        |  8 ++--
 ElectronNET.API/Dialog.cs         |  8 ++--
 ElectronNET.API/Dock.cs           |  8 ++--
 ElectronNET.API/GlobalShortcut.cs |  2 +-
 ElectronNET.API/HostHook.cs       |  2 +-
 ElectronNET.API/NativeTheme.cs    |  8 ++--
 ElectronNET.API/Notification.cs   |  2 +-
 ElectronNET.API/Screen.cs         | 12 +++---
 ElectronNET.API/Session.cs        | 28 ++++++-------
 ElectronNET.API/Shell.cs          | 12 +++---
 ElectronNET.API/Tray.cs           |  2 +-
 ElectronNET.API/WebContents.cs    | 10 ++---
 ElectronNET.API/WindowManager.cs  |  4 +-
 19 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/ElectronNET.API/App.cs b/ElectronNET.API/App.cs
index 1ae66c2..ddc0e07 100644
--- a/ElectronNET.API/App.cs
+++ b/ElectronNET.API/App.cs
@@ -494,7 +494,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<string> GetNameAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("appGetNameCompleted", (result) =>
             {
@@ -645,7 +645,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appGetAppPathCompleted", (path) =>
@@ -686,7 +686,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appGetPathCompleted", (path) =>
@@ -729,7 +729,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using(cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appGetVersionCompleted", (version) =>
@@ -757,7 +757,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appGetLocaleCompleted", (local) =>
@@ -883,7 +883,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appSetAsDefaultProtocolClientCompleted", (success) =>
@@ -937,7 +937,7 @@ namespace ElectronNET.API
         {           
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appRemoveAsDefaultProtocolClientCompleted", (success) =>
@@ -1009,7 +1009,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appIsDefaultProtocolClientCompleted", (success) =>
@@ -1037,7 +1037,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appSetUserTasksCompleted", (success) =>
@@ -1062,7 +1062,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<JumpListSettings>();
+            var taskCompletionSource = new TaskCompletionSource<JumpListSettings>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<JumpListSettings>("appGetJumpListSettingsCompleted", (jumpListSettings) =>
@@ -1124,7 +1124,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appRequestSingleInstanceLockCompleted", (success) =>
@@ -1165,7 +1165,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appHasSingleInstanceLockCompleted", (hasLock) =>
@@ -1217,7 +1217,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appGetCurrentActivityTypeCompleted", (activityType) =>
@@ -1270,7 +1270,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<int>();
+            var taskCompletionSource = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<int>("appImportCertificateCompleted", (result) =>
@@ -1298,7 +1298,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<ProcessMetric[]>();
+            var taskCompletionSource = new TaskCompletionSource<ProcessMetric[]>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<ProcessMetric[]>("appGetAppMetricsCompleted", (result) =>
@@ -1324,7 +1324,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<GPUFeatureStatus>();
+            var taskCompletionSource = new TaskCompletionSource<GPUFeatureStatus>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<GPUFeatureStatus>("appGetGpuFeatureStatusCompleted", (result) =>
@@ -1354,7 +1354,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appSetBadgeCountCompleted", (success) =>
@@ -1378,7 +1378,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<int>();
+            var taskCompletionSource = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<int>("appGetBadgeCountCompleted", (count) =>
@@ -1407,7 +1407,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appIsUnityRunningCompleted", (isUnityRunning) =>
@@ -1442,7 +1442,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<LoginItemSettings>();
+            var taskCompletionSource = new TaskCompletionSource<LoginItemSettings>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<LoginItemSettings>("appGetLoginItemSettingsCompleted", (result) =>
@@ -1486,7 +1486,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appIsAccessibilitySupportEnabledCompleted", (isAccessibilitySupportEnabled) =>
@@ -1568,7 +1568,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<string> GetUserAgentFallbackAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("appGetUserAgentFallbackCompleted", (result) =>
             {
diff --git a/ElectronNET.API/AutoUpdater.cs b/ElectronNET.API/AutoUpdater.cs
index e16ad49..c65b657 100644
--- a/ElectronNET.API/AutoUpdater.cs
+++ b/ElectronNET.API/AutoUpdater.cs
@@ -18,7 +18,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> IsAutoDownloadEnabledAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("autoUpdater-autoDownload-get-reply", (result) =>
             {
@@ -38,7 +38,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> IsAutoInstallOnAppQuitEnabledAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("autoUpdater-autoInstallOnAppQuit-get-reply", (result) =>
             {
@@ -59,7 +59,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> IsAllowPrereleaseEnabledAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("autoUpdater-allowPrerelease-get-reply", (result) =>
             {
@@ -78,7 +78,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> IsFullChangeLogEnabledAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("autoUpdater-fullChangelog-get-reply", (result) =>
             {
@@ -93,7 +93,7 @@ namespace ElectronNET.API
 
         public Task<bool> IsAllowDowngradeEnabledAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("autoUpdater-allowDowngrade-get-reply", (result) =>
             {
@@ -174,7 +174,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<string> GetUpdateConfigPathAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("autoUpdater-updateConfigPath-get-reply", (result) =>
             {
@@ -192,7 +192,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<SemVer> GetCurrentVersionAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<SemVer>();
+            var taskCompletionSource = new TaskCompletionSource<SemVer>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<SemVer>("autoUpdater-currentVersion-get-reply", (version) =>
             {
@@ -210,7 +210,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<string> GetChannelAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("autoUpdater-channel-get-reply", (result) =>
             {
@@ -229,7 +229,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<Dictionary<string, string>> GetRequestHeadersAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<Dictionary<string, string>>();
+            var taskCompletionSource = new TaskCompletionSource<Dictionary<string, string>>(TaskCreationOptions.RunContinuationsAsynchronously);
             BridgeConnector.On<Dictionary<string, string>>("autoUpdater-requestHeaders-get-reply", (headers) =>
             {
                 BridgeConnector.Off("autoUpdater-requestHeaders-get-reply");
@@ -455,7 +455,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<UpdateCheckResult> CheckForUpdatesAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<UpdateCheckResult>();
+            var taskCompletionSource = new TaskCompletionSource<UpdateCheckResult>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<UpdateCheckResult>("autoUpdaterCheckForUpdatesComplete" + guid, (updateCheckResult) =>
@@ -494,7 +494,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<UpdateCheckResult> CheckForUpdatesAndNotifyAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<UpdateCheckResult>();
+            var taskCompletionSource = new TaskCompletionSource<UpdateCheckResult>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<UpdateCheckResult>("autoUpdaterCheckForUpdatesAndNotifyComplete" + guid, (updateCheckResult) =>
@@ -548,7 +548,7 @@ namespace ElectronNET.API
         /// <returns>Path to downloaded file.</returns>
         public Task<string> DownloadUpdateAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>("autoUpdaterDownloadUpdateComplete" + guid, (downloadedPath) =>
@@ -568,7 +568,7 @@ namespace ElectronNET.API
         /// <returns>Feed URL.</returns>
         public Task<string> GetFeedURLAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>("autoUpdaterGetFeedURLComplete" + guid, (downloadedPath) =>
diff --git a/ElectronNET.API/BrowserView.cs b/ElectronNET.API/BrowserView.cs
index 82b6daf..6b6e405 100644
--- a/ElectronNET.API/BrowserView.cs
+++ b/ElectronNET.API/BrowserView.cs
@@ -33,7 +33,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<Rectangle> GetBoundsAsync()
         {
-                var taskCompletionSource = new TaskCompletionSource<Rectangle>();
+                var taskCompletionSource = new TaskCompletionSource<Rectangle>(TaskCreationOptions.RunContinuationsAsynchronously);
 
                 BridgeConnector.On<Rectangle>("browserView-getBounds-reply", (result) =>
                 {
diff --git a/ElectronNET.API/BrowserWindow.cs b/ElectronNET.API/BrowserWindow.cs
index 4ebd586..aea3cf6 100644
--- a/ElectronNET.API/BrowserWindow.cs
+++ b/ElectronNET.API/BrowserWindow.cs
@@ -951,7 +951,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsFocusedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isFocused-completed", (isFocused) => {
                 BridgeConnector.Off("browserWindow-isFocused-completed");
@@ -970,7 +970,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsDestroyedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isDestroyed-completed", (isDestroyed) => {
                 BridgeConnector.Off("browserWindow-isDestroyed-completed");
@@ -1013,7 +1013,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsVisibleAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isVisible-completed", (isVisible) => {
                 BridgeConnector.Off("browserWindow-isVisible-completed");
@@ -1032,7 +1032,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsModalAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isModal-completed", (isModal) => {
                 BridgeConnector.Off("browserWindow-isModal-completed");
@@ -1067,7 +1067,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsMaximizedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMaximized-completed", (isMaximized) => {
                 BridgeConnector.Off("browserWindow-isMaximized-completed");
@@ -1102,7 +1102,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsMinimizedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMinimized-completed", (isMinimized) => {
                 BridgeConnector.Off("browserWindow-isMinimized-completed");
@@ -1129,7 +1129,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsFullScreenAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isFullScreen-completed", (isFullScreen) => {
                 BridgeConnector.Off("browserWindow-isFullScreen-completed");
@@ -1218,7 +1218,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<Rectangle> GetBoundsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<Rectangle>();
+            var taskCompletionSource = new TaskCompletionSource<Rectangle>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Rectangle>("browserWindow-getBounds-completed", (getBounds) => {
                 BridgeConnector.Off("browserWindow-getBounds-completed");
@@ -1256,7 +1256,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<Rectangle> GetContentBoundsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<Rectangle>();
+            var taskCompletionSource = new TaskCompletionSource<Rectangle>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Rectangle>("browserWindow-getContentBounds-completed", (getContentBounds) => {
                 BridgeConnector.Off("browserWindow-getContentBounds-completed");
@@ -1296,7 +1296,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetSizeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getSize-completed", (size) => {
                 BridgeConnector.Off("browserWindow-getSize-completed");
@@ -1336,7 +1336,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetContentSizeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getContentSize-completed", (size) => {
                 BridgeConnector.Off("browserWindow-getContentSize-completed");
@@ -1365,7 +1365,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetMinimumSizeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getMinimumSize-completed", (size) => {
                 BridgeConnector.Off("browserWindow-getMinimumSize-completed");
@@ -1394,7 +1394,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetMaximumSizeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getMaximumSize-completed", (size) => {
                 BridgeConnector.Off("browserWindow-getMaximumSize-completed");
@@ -1422,7 +1422,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsResizableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isResizable-completed", (resizable) => {
                 BridgeConnector.Off("browserWindow-isResizable-completed");
@@ -1452,7 +1452,7 @@ namespace ElectronNET.API
         /// <returns>On Linux always returns true.</returns>
         public Task<bool> IsMovableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMovable-completed", (movable) => {
                 BridgeConnector.Off("browserWindow-isMovable-completed");
@@ -1482,7 +1482,7 @@ namespace ElectronNET.API
         /// <returns>On Linux always returns true.</returns>
         public Task<bool> IsMinimizableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMinimizable-completed", (minimizable) => {
                 BridgeConnector.Off("browserWindow-isMinimizable-completed");
@@ -1512,7 +1512,7 @@ namespace ElectronNET.API
         /// <returns>On Linux always returns true.</returns>
         public Task<bool> IsMaximizableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMaximizable-completed", (maximizable) => {
                 BridgeConnector.Off("browserWindow-isMaximizable-completed");
@@ -1540,7 +1540,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsFullScreenableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isFullScreenable-completed", (fullscreenable) => {
                 BridgeConnector.Off("browserWindow-isFullScreenable-completed");
@@ -1570,7 +1570,7 @@ namespace ElectronNET.API
         /// <returns>On Linux always returns true.</returns>
         public Task<bool> IsClosableAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isClosable-completed", (closable) => {
                 BridgeConnector.Off("browserWindow-isClosable-completed");
@@ -1630,7 +1630,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsAlwaysOnTopAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isAlwaysOnTop-completed", (isAlwaysOnTop) => {
                 BridgeConnector.Off("browserWindow-isAlwaysOnTop-completed");
@@ -1697,7 +1697,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetPositionAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getPosition-completed", (position) => {
                 BridgeConnector.Off("browserWindow-getPosition-completed");
@@ -1727,7 +1727,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> GetTitleAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("browserWindow-getTitle-completed", (title) => {
                 BridgeConnector.Off("browserWindow-getTitle-completed");
@@ -1796,7 +1796,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsKioskAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isKiosk-completed", (isKiosk) => {
                 BridgeConnector.Off("browserWindow-isKiosk-completed");
@@ -1815,7 +1815,7 @@ namespace ElectronNET.API
         /// <returns>string of the native handle obtained, HWND on Windows, NSView* on macOS, and Window (unsigned long) on Linux.</returns>
         public Task<string> GetNativeWindowHandle()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("browserWindow-getNativeWindowHandle-completed", (nativeWindowHandle) =>
             {
@@ -1844,7 +1844,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> GetRepresentedFilenameAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("browserWindow-getRepresentedFilename-completed", (pathname) => {
                 BridgeConnector.Off("browserWindow-getRepresentedFilename-completed");
@@ -1873,7 +1873,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsDocumentEditedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isDocumentEdited-completed", (edited) => {
                 BridgeConnector.Off("browserWindow-isDocumentEdited-completed");
@@ -2016,7 +2016,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> HasShadowAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-hasShadow-completed", (hasShadow) => {
                 BridgeConnector.Off("browserWindow-hasShadow-completed");
@@ -2052,7 +2052,7 @@ namespace ElectronNET.API
         /// <returns>Whether the buttons were added successfully.</returns>
         public Task<bool> SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindowSetThumbarButtons-completed", (success) => {
                 BridgeConnector.Off("browserWindowSetThumbarButtons-completed");
@@ -2132,7 +2132,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsMenuBarAutoHideAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMenuBarAutoHide-completed", (isMenuBarAutoHide) => {
                 BridgeConnector.Off("browserWindow-isMenuBarAutoHide-completed");
@@ -2161,7 +2161,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsMenuBarVisibleAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isMenuBarVisible-completed", (isMenuBarVisible) => {
                 BridgeConnector.Off("browserWindow-isMenuBarVisible-completed");
@@ -2193,7 +2193,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsVisibleOnAllWorkspacesAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("browserWindow-isVisibleOnAllWorkspaces-completed", (isVisibleOnAllWorkspaces) => {
                 BridgeConnector.Off("browserWindow-isVisibleOnAllWorkspaces-completed");
@@ -2255,7 +2255,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<BrowserWindow> GetParentWindowAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<BrowserWindow>();
+            var taskCompletionSource = new TaskCompletionSource<BrowserWindow>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int>("browserWindow-getParentWindow-completed", (id) => {
                 BridgeConnector.Off("browserWindow-getParentWindow-completed");
@@ -2274,7 +2274,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<List<BrowserWindow>> GetChildWindowsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<List<BrowserWindow>>();
+            var taskCompletionSource = new TaskCompletionSource<List<BrowserWindow>>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int[]>("browserWindow-getChildWindows-completed", (ids) => {
                 BridgeConnector.Off("browserWindow-getChildWindows-completed");
diff --git a/ElectronNET.API/Clipboard.cs b/ElectronNET.API/Clipboard.cs
index 68d1876..a0bdf7b 100644
--- a/ElectronNET.API/Clipboard.cs
+++ b/ElectronNET.API/Clipboard.cs
@@ -42,7 +42,7 @@ namespace ElectronNET.API
         /// <returns>The content in the clipboard as plain text.</returns>
         public Task<string> ReadTextAsync(string type = "")
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("clipboard-readText-Completed", (text) =>
             {
@@ -73,7 +73,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> ReadHTMLAsync(string type = "")
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("clipboard-readHTML-Completed", (text) =>
             {
@@ -104,7 +104,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> ReadRTFAsync(string type = "")
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("clipboard-readRTF-Completed", (text) =>
             {
@@ -136,7 +136,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<ReadBookmark> ReadBookmarkAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<ReadBookmark>();
+            var taskCompletionSource = new TaskCompletionSource<ReadBookmark>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<ReadBookmark>("clipboard-readBookmark-Completed", (bookmark) =>
             {
@@ -173,7 +173,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> ReadFindTextAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("clipboard-readFindText-Completed", (text) =>
             {
@@ -213,7 +213,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string[]> AvailableFormatsAsync(string type = "")
         {
-            var taskCompletionSource = new TaskCompletionSource<string[]>();
+            var taskCompletionSource = new TaskCompletionSource<string[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string[]>("clipboard-availableFormats-Completed", (formats) =>
             {
@@ -244,7 +244,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<NativeImage> ReadImageAsync(string type = "")
         {
-            var taskCompletionSource = new TaskCompletionSource<NativeImage>();
+            var taskCompletionSource = new TaskCompletionSource<NativeImage>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<NativeImage>("clipboard-readImage-Completed", (image) =>
             {
diff --git a/ElectronNET.API/CommandLine.cs b/ElectronNET.API/CommandLine.cs
index 09c5e1e..647f44b 100644
--- a/ElectronNET.API/CommandLine.cs
+++ b/ElectronNET.API/CommandLine.cs
@@ -70,7 +70,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("appCommandLineHasSwitchCompleted", (result) =>
@@ -98,7 +98,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("appCommandLineGetSwitchValueCompleted", (result) =>
diff --git a/ElectronNET.API/Cookies.cs b/ElectronNET.API/Cookies.cs
index 2d8ca65..13e6f63 100644
--- a/ElectronNET.API/Cookies.cs
+++ b/ElectronNET.API/Cookies.cs
@@ -62,7 +62,7 @@ namespace ElectronNET.API
         /// <returns>A task which resolves an array of cookie objects.</returns>
         public Task<Cookie[]> GetAsync(CookieFilter filter)
         {
-            var taskCompletionSource = new TaskCompletionSource<Cookie[]>();
+            var taskCompletionSource = new TaskCompletionSource<Cookie[]>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<Cookie[]>("webContents-session-cookies-get-completed" + guid, (cookies) =>
@@ -83,7 +83,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task SetAsync(CookieDetails details)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-cookies-set-completed" + guid, () =>
@@ -105,7 +105,7 @@ namespace ElectronNET.API
         /// <returns>A task which resolves when the cookie has been removed</returns>
         public Task RemoveAsync(string url, string name)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-cookies-remove-completed" + guid, () =>
@@ -125,7 +125,7 @@ namespace ElectronNET.API
         /// <returns>A task which resolves when the cookie store has been flushed</returns>
         public Task FlushStoreAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-cookies-flushStore-completed" + guid, () =>
diff --git a/ElectronNET.API/Dialog.cs b/ElectronNET.API/Dialog.cs
index 9df9e4a..c8c8aeb 100644
--- a/ElectronNET.API/Dialog.cs
+++ b/ElectronNET.API/Dialog.cs
@@ -48,7 +48,7 @@ namespace ElectronNET.API
         /// <returns>An array of file paths chosen by the user</returns>
         public Task<string[]> ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialogOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<string[]>();
+            var taskCompletionSource = new TaskCompletionSource<string[]>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string[]>("showOpenDialogComplete" + guid, (filePaths) =>
@@ -79,7 +79,7 @@ namespace ElectronNET.API
         /// <returns>Returns String, the path of the file chosen by the user, if a callback is provided it returns an empty string.</returns>
         public Task<string> ShowSaveDialogAsync(BrowserWindow browserWindow, SaveDialogOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>("showSaveDialogComplete" + guid, (filename) =>
@@ -148,7 +148,7 @@ namespace ElectronNET.API
         /// <returns>The API call will be asynchronous and the result will be passed via MessageBoxResult.</returns>
         public Task<MessageBoxResult> ShowMessageBoxAsync(BrowserWindow browserWindow, MessageBoxOptions messageBoxOptions)
         {
-            var taskCompletionSource = new TaskCompletionSource<MessageBoxResult>();
+            var taskCompletionSource = new TaskCompletionSource<MessageBoxResult>(TaskCreationOptions.RunContinuationsAsynchronously);
             var guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<MessageBoxResponse>("showMessageBoxComplete" + guid, (args) =>
@@ -214,7 +214,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ShowCertificateTrustDialogAsync(BrowserWindow browserWindow, CertificateTrustDialogOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("showCertificateTrustDialogComplete" + guid, () =>
diff --git a/ElectronNET.API/Dock.cs b/ElectronNET.API/Dock.cs
index e947fdf..82c264f 100644
--- a/ElectronNET.API/Dock.cs
+++ b/ElectronNET.API/Dock.cs
@@ -54,7 +54,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<int>();
+            var taskCompletionSource = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<int>("dock-bounce-completed", (id) =>
@@ -106,7 +106,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<string>("dock-getBadge-completed", (text) =>
@@ -148,7 +148,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<bool>("dock-isVisible-completed", (isVisible) =>
@@ -198,7 +198,7 @@ namespace ElectronNET.API
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var taskCompletionSource = new TaskCompletionSource<Menu>();
+            var taskCompletionSource = new TaskCompletionSource<Menu>(TaskCreationOptions.RunContinuationsAsynchronously);
             using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
             {
                 BridgeConnector.On<Menu>("dock-getMenu-completed", (menu) =>
diff --git a/ElectronNET.API/GlobalShortcut.cs b/ElectronNET.API/GlobalShortcut.cs
index 5a68272..29f19dd 100644
--- a/ElectronNET.API/GlobalShortcut.cs
+++ b/ElectronNET.API/GlobalShortcut.cs
@@ -70,7 +70,7 @@ namespace ElectronNET.API
         /// <returns>Whether this application has registered accelerator.</returns>
         public Task<bool> IsRegisteredAsync(string accelerator)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             
             BridgeConnector.On<bool>("globalShortcut-isRegisteredCompleted" + accelerator.GetHashCode(), (isRegistered) =>
             {
diff --git a/ElectronNET.API/HostHook.cs b/ElectronNET.API/HostHook.cs
index 8b98258..93e1257 100644
--- a/ElectronNET.API/HostHook.cs
+++ b/ElectronNET.API/HostHook.cs
@@ -65,7 +65,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<T> CallAsync<T>(string socketEventName, params dynamic[] arguments)
         {
-            var taskCompletionSource = new TaskCompletionSource<T>();
+            var taskCompletionSource = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>(socketEventName + "Error" + guid, (result) =>
diff --git a/ElectronNET.API/NativeTheme.cs b/ElectronNET.API/NativeTheme.cs
index a87b030..d9cb77c 100644
--- a/ElectronNET.API/NativeTheme.cs
+++ b/ElectronNET.API/NativeTheme.cs
@@ -103,7 +103,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<ThemeSourceMode> GetThemeSourceAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<ThemeSourceMode>();
+            var taskCompletionSource = new TaskCompletionSource<ThemeSourceMode>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("nativeTheme-themeSource-getCompleted", (themeSource) =>
             {
@@ -126,7 +126,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> ShouldUseDarkColorsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("nativeTheme-shouldUseDarkColors-completed", (shouldUseDarkColors) => {
                 BridgeConnector.Off("nativeTheme-shouldUseDarkColors-completed");
@@ -145,7 +145,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> ShouldUseHighContrastColorsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("nativeTheme-shouldUseHighContrastColors-completed", (shouldUseHighContrastColors) => {
                 BridgeConnector.Off("nativeTheme-shouldUseHighContrastColors-completed");
@@ -164,7 +164,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task<bool> ShouldUseInvertedColorSchemeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("nativeTheme-shouldUseInvertedColorScheme-completed", (shouldUseInvertedColorScheme) => {
                 BridgeConnector.Off("nativeTheme-shouldUseInvertedColorScheme-completed");
diff --git a/ElectronNET.API/Notification.cs b/ElectronNET.API/Notification.cs
index fab7d7c..5745cc5 100644
--- a/ElectronNET.API/Notification.cs
+++ b/ElectronNET.API/Notification.cs
@@ -122,7 +122,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsSupportedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("notificationIsSupportedComplete", (isSupported) =>
             {
diff --git a/ElectronNET.API/Screen.cs b/ElectronNET.API/Screen.cs
index dbcb8ba..e8c4a0d 100644
--- a/ElectronNET.API/Screen.cs
+++ b/ElectronNET.API/Screen.cs
@@ -131,7 +131,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<Point> GetCursorScreenPointAsync() 
         {
-            var taskCompletionSource = new TaskCompletionSource<Point>();
+            var taskCompletionSource = new TaskCompletionSource<Point>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Point>("screen-getCursorScreenPointCompleted", (point) =>
             {
@@ -151,7 +151,7 @@ namespace ElectronNET.API
         /// <returns>The height of the menu bar in pixels.</returns>
         public Task<int> GetMenuBarHeightAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int>();
+            var taskCompletionSource = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int>("screen-getMenuBarHeightCompleted", (height) =>
             {
@@ -171,7 +171,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<Display> GetPrimaryDisplayAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<Display>();
+            var taskCompletionSource = new TaskCompletionSource<Display>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Display>("screen-getPrimaryDisplayCompleted", (display) =>
             {
@@ -191,7 +191,7 @@ namespace ElectronNET.API
         /// <returns>An array of displays that are currently available.</returns>
         public Task<Display[]> GetAllDisplaysAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<Display[]>();
+            var taskCompletionSource = new TaskCompletionSource<Display[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Display[]>("screen-getAllDisplaysCompleted", (displays) =>
             {
@@ -211,7 +211,7 @@ namespace ElectronNET.API
         /// <returns>The display nearest the specified point.</returns>
         public Task<Display> GetDisplayNearestPointAsync(Point point)
         {
-            var taskCompletionSource = new TaskCompletionSource<Display>();
+            var taskCompletionSource = new TaskCompletionSource<Display>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Display>("screen-getDisplayNearestPointCompleted", (display) =>
             {
@@ -232,7 +232,7 @@ namespace ElectronNET.API
         /// <returns>The display that most closely intersects the provided bounds.</returns>
         public Task<Display> GetDisplayMatchingAsync(Rectangle rectangle)
         {
-            var taskCompletionSource = new TaskCompletionSource<Display>();
+            var taskCompletionSource = new TaskCompletionSource<Display>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Display>("screen-getDisplayMatching", (display) =>
             {
diff --git a/ElectronNET.API/Session.cs b/ElectronNET.API/Session.cs
index 3b006c1..f15f398 100644
--- a/ElectronNET.API/Session.cs
+++ b/ElectronNET.API/Session.cs
@@ -47,7 +47,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ClearAuthCacheAsync(RemovePassword options)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearAuthCache-completed" + guid, () =>
@@ -66,7 +66,7 @@ namespace ElectronNET.API
         /// </summary>
         public Task ClearAuthCacheAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearAuthCache-completed" + guid, () =>
@@ -86,7 +86,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ClearCacheAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearCache-completed" + guid, () =>
@@ -106,7 +106,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ClearHostResolverCacheAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearHostResolverCache-completed" + guid, () =>
@@ -126,7 +126,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ClearStorageDataAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearStorageData-completed" + guid, () =>
@@ -147,7 +147,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task ClearStorageDataAsync(ClearStorageDataOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-clearStorageData-options-completed" + guid, () =>
@@ -207,7 +207,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<int[]> GetBlobDataAsync(string identifier)
         {
-            var taskCompletionSource = new TaskCompletionSource<int[]>();
+            var taskCompletionSource = new TaskCompletionSource<int[]>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<int[]>("webContents-session-getBlobData-completed" + guid, (buffer) =>
@@ -227,7 +227,7 @@ namespace ElectronNET.API
         /// <returns>Callback is invoked with the session's current cache size.</returns>
         public Task<int> GetCacheSizeAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<int>();
+            var taskCompletionSource = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<int>("webContents-session-getCacheSize-completed" + guid, (size) =>
@@ -247,7 +247,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string[]> GetPreloadsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<string[]>();
+            var taskCompletionSource = new TaskCompletionSource<string[]>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string[]>("webContents-session-getPreloads-completed" + guid, (preloads) =>
@@ -267,7 +267,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> GetUserAgent()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>("webContents-session-getUserAgent-completed" + guid, (userAgent) =>
@@ -289,7 +289,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<string> ResolveProxyAsync(string url)
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On<string>("webContents-session-resolveProxy-completed" + guid, (proxy) =>
@@ -331,7 +331,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task SetProxyAsync(ProxyConfig config)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             string guid = Guid.NewGuid().ToString();
 
             BridgeConnector.On("webContents-session-setProxy-completed" + guid, () =>
@@ -379,7 +379,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<ChromeExtensionInfo[]> GetAllExtensionsAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<ChromeExtensionInfo[]>();
+            var taskCompletionSource = new TaskCompletionSource<ChromeExtensionInfo[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<ChromeExtensionInfo[]>("webContents-session-getAllExtensions-completed", (extensionslist) =>
             {
@@ -431,7 +431,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<Extension> LoadExtensionAsync(string path, bool allowFileAccess = false)
         {
-            var taskCompletionSource = new TaskCompletionSource<Extension>();
+            var taskCompletionSource = new TaskCompletionSource<Extension>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<Extension>("webContents-session-loadExtension-completed", (extension) =>
             {
diff --git a/ElectronNET.API/Shell.cs b/ElectronNET.API/Shell.cs
index d126f39..d2e4447 100644
--- a/ElectronNET.API/Shell.cs
+++ b/ElectronNET.API/Shell.cs
@@ -42,7 +42,7 @@ namespace ElectronNET.API
         /// <param name="fullPath">The full path to the directory / file.</param>
         public Task ShowItemInFolderAsync(string fullPath)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On("shell-showItemInFolderCompleted", () =>
             {
@@ -61,7 +61,7 @@ namespace ElectronNET.API
         /// <returns>The error message corresponding to the failure if a failure occurred, otherwise <see cref="string.Empty"/>.</returns>
         public Task<string> OpenPathAsync(string path)
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("shell-openPathCompleted", (errorMessage) =>
             {
@@ -95,7 +95,7 @@ namespace ElectronNET.API
         /// <returns>The error message corresponding to the failure if a failure occurred, otherwise <see cref="string.Empty"/>.</returns>
         public Task<string> OpenExternalAsync(string url, OpenExternalOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<string>("shell-openExternalCompleted", (error) =>
             {
@@ -123,7 +123,7 @@ namespace ElectronNET.API
         /// <returns> Whether the item was successfully moved to the trash.</returns>
         public Task<bool> TrashItemAsync(string fullPath)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("shell-trashItem-completed", (success) =>
             {
@@ -154,7 +154,7 @@ namespace ElectronNET.API
         /// <returns>Whether the shortcut was created successfully.</returns>
         public Task<bool> WriteShortcutLinkAsync(string shortcutPath, ShortcutLinkOperation operation, ShortcutDetails options)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("shell-writeShortcutLinkCompleted", (success) =>
             {
@@ -176,7 +176,7 @@ namespace ElectronNET.API
         /// <returns><see cref="ShortcutDetails"/> of the shortcut.</returns>
         public Task<ShortcutDetails> ReadShortcutLinkAsync(string shortcutPath)
         {
-            var taskCompletionSource = new TaskCompletionSource<ShortcutDetails>();
+            var taskCompletionSource = new TaskCompletionSource<ShortcutDetails>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<ShortcutDetails>("shell-readShortcutLinkCompleted", (shortcutDetails) =>
             {
diff --git a/ElectronNET.API/Tray.cs b/ElectronNET.API/Tray.cs
index 933f64a..252756c 100644
--- a/ElectronNET.API/Tray.cs
+++ b/ElectronNET.API/Tray.cs
@@ -323,7 +323,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<bool> IsDestroyedAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("tray-isDestroyedCompleted", (isDestroyed) =>
             {
diff --git a/ElectronNET.API/WebContents.cs b/ElectronNET.API/WebContents.cs
index 10ed187..8689c6c 100644
--- a/ElectronNET.API/WebContents.cs
+++ b/ElectronNET.API/WebContents.cs
@@ -113,7 +113,7 @@ namespace ElectronNET.API
         /// <returns>printers</returns>
         public Task<PrinterInfo[]> GetPrintersAsync()
         {
-            var taskCompletionSource = new TaskCompletionSource<PrinterInfo[]>();
+            var taskCompletionSource = new TaskCompletionSource<PrinterInfo[]>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<PrinterInfo[]>("webContents-getPrinters-completed", (printers) =>
             {
@@ -134,7 +134,7 @@ namespace ElectronNET.API
         /// <returns>success</returns>
         public Task<bool> PrintAsync(PrintOptions options = null)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("webContents-print-completed", (success) =>
             {
@@ -165,7 +165,7 @@ namespace ElectronNET.API
         /// <returns>success</returns>
         public Task<bool> PrintToPDFAsync(string path, PrintToPDFOptions options = null)
         {
-            var taskCompletionSource = new TaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<bool>("webContents-printToPDF-completed", (success) =>
             {
@@ -192,7 +192,7 @@ namespace ElectronNET.API
         /// <returns>URL of the loaded page</returns>
         public Task<string> GetUrl()
         {
-            var taskCompletionSource = new TaskCompletionSource<string>();
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             var eventString = "webContents-getUrl" + Id;
             BridgeConnector.On<string>(eventString, (url) =>
@@ -238,7 +238,7 @@ namespace ElectronNET.API
         /// <param name="options"></param>
         public Task LoadURLAsync(string url, LoadURLOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<object>();
+            var taskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On("webContents-loadURL-complete" + Id, () =>
             {
diff --git a/ElectronNET.API/WindowManager.cs b/ElectronNET.API/WindowManager.cs
index b156497..4860aab 100644
--- a/ElectronNET.API/WindowManager.cs
+++ b/ElectronNET.API/WindowManager.cs
@@ -92,7 +92,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<BrowserWindow> CreateWindowAsync(BrowserWindowOptions options, string loadUrl = "http://localhost")
         {
-            var taskCompletionSource = new TaskCompletionSource<BrowserWindow>();
+            var taskCompletionSource = new TaskCompletionSource<BrowserWindow>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int>("BrowserWindowCreated", (id) =>
             {
@@ -181,7 +181,7 @@ namespace ElectronNET.API
         /// <returns></returns>
         public Task<BrowserView> CreateBrowserViewAsync(BrowserViewConstructorOptions options)
         {
-            var taskCompletionSource = new TaskCompletionSource<BrowserView>();
+            var taskCompletionSource = new TaskCompletionSource<BrowserView>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             BridgeConnector.On<int>("BrowserViewCreated", (id) =>
             {