From afa69280f5c649534311dd5862998bfbe86abcae Mon Sep 17 00:00:00 2001
From: Gregor Biswanger <gregor.biswanger@web-enliven.de>
Date: Tue, 7 Jun 2022 22:55:00 +0200
Subject: [PATCH] Fixed merge conflicts

---
 ElectronNET.API/BridgeConnector.cs       | 13 +++++--------
 ElectronNET.CLI/Commands/BuildCommand.cs |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ElectronNET.API/BridgeConnector.cs b/ElectronNET.API/BridgeConnector.cs
index 7432c6d..95c9e0d 100644
--- a/ElectronNET.API/BridgeConnector.cs
+++ b/ElectronNET.API/BridgeConnector.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using SocketIOClient;
 using SocketIOClient.JsonSerializer;
@@ -298,7 +299,6 @@ namespace ElectronNET.API
             }
         }
 
-<<<<<<< HEAD
         private class CamelCaseNewtonsoftJsonSerializer : NewtonsoftJsonSerializer
         {
             public CamelCaseNewtonsoftJsonSerializer(int eio) : base(eio)
@@ -315,7 +315,6 @@ namespace ElectronNET.API
                 };
             }
         }
-=======
         public static async Task<T> GetValueOverSocketAsync<T>(string eventString, string eventCompletedString)
         {
             CancellationToken cancellationToken = new();
@@ -345,7 +344,7 @@ namespace ElectronNET.API
                     }
                 });
 
-                BridgeConnector.Socket.Emit(eventString);
+                await BridgeConnector.Socket.EmitAsync(eventString);
 
                 return await taskCompletionSource.Task.ConfigureAwait(false);
             }
@@ -380,7 +379,7 @@ namespace ElectronNET.API
                     }
                 });
 
-                BridgeConnector.Socket.Emit(eventString);
+                await BridgeConnector.Socket.EmitAsync(eventString);
 
                 return await taskCompletionSource.Task.ConfigureAwait(false);
             }
@@ -406,7 +405,7 @@ namespace ElectronNET.API
 
                     try
                     {
-                        taskCompletionSource.SetResult( ((JArray)value).ToObject<T>() );
+                        taskCompletionSource.SetResult(((JArray)value).ToObject<T>() );
                     }
                     catch (Exception e)
                     {
@@ -414,12 +413,10 @@ namespace ElectronNET.API
                     }
                 });
 
-                BridgeConnector.Socket.Emit(eventString);
+                await BridgeConnector.Socket.EmitAsync(eventString);
 
                 return await taskCompletionSource.Task.ConfigureAwait(false);
             }
         }
-        
->>>>>>> 64e058b0b59a4fbbd6c0ec9de2ee1850a66684c4
     }
 }
diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs
index 0c96cfd..b7f9697 100644
--- a/ElectronNET.CLI/Commands/BuildCommand.cs
+++ b/ElectronNET.CLI/Commands/BuildCommand.cs
@@ -274,7 +274,7 @@ namespace ElectronNET.CLI.Commands
             return list;
         }
 
-        internal static Dictionary<string, string> GetDotNetPublishFlags(SimpleCommandLineParser parser, string defaultReadyToRun, string defaultSingleFile)
+        internal Dictionary<string, string> GetDotNetPublishFlags(SimpleCommandLineParser parser, string defaultReadyToRun, string defaultSingleFile)
         {
             var dotNetPublishFlags = new Dictionary<string, string>
             {