Multi-platform support (#98)

Author: kblok

lib/PuppeteerSharp.Tests/PuppeteerLoaderFixture.cs

@@ -58,6 +58,7 @@ private async Task StartWebServerAsync()
                                              "PuppeteerSharp.TestServer");
 
             _webServerProcess = new Process();
+            _webServerProcess.StartInfo.UseShellExecute = false;
             _webServerProcess.StartInfo.FileName = "dotnet";
             _webServerProcess.StartInfo.WorkingDirectory = webServerPath;
             _webServerProcess.StartInfo.Arguments = $"./bin/{build}/netcoreapp2.0/PuppeteerSharp.TestServer.dll";

lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />

lib/PuppeteerSharp/Connection.cs

@@ -18,6 +18,7 @@ public Connection(string url, int delay, ClientWebSocket ws)
             Delay = delay;
             WebSocket = ws;
 
+            _socketQueue = new TaskQueue();
             _responses = new Dictionary<int, TaskCompletionSource<dynamic>>();
             _sessions = new Dictionary<string, Session>();
             _connectionCloseTask = new TaskCompletionSource<bool>();
@@ -36,6 +37,7 @@ public Connection(string url, int delay, ClientWebSocket ws)
 
         private bool _closeMessageSent;
         private const string CloseMessage = "Browser.close";
+        private TaskQueue _socketQueue;
         #endregion
 
         #region Properties
@@ -62,7 +64,8 @@ public async Task<dynamic> SendAsync(string method, dynamic args = null)
             var encoded = Encoding.UTF8.GetBytes(message);
             var buffer = new ArraySegment<Byte>(encoded, 0, encoded.Length);
             QueueId(id);
-            await WebSocket.SendAsync(buffer, WebSocketMessageType.Text, true, default(CancellationToken));
+
+            await _socketQueue.Enqueue(() => WebSocket.SendAsync(buffer, WebSocketMessageType.Text, true, default(CancellationToken)));
 
             //I don't know if this will be the final solution.
             //For now this will prevent the WebSocket from failing after the process is killed by the close method.

lib/PuppeteerSharp/Helpers/ProcessExtensions.cs

@@ -9,11 +9,21 @@ public static class ProcessExtensions
     {
         public static void RemoveExitedEvent(this Process process)
         {
-            var eventField = typeof(Process).GetField("_onExited", BindingFlags.NonPublic | BindingFlags.Instance);
-            object obj = eventField.GetValue(process);
-            PropertyInfo pi = process.GetType().GetProperty("Events", BindingFlags.NonPublic | BindingFlags.Instance);
-            EventHandlerList list = (EventHandlerList)pi.GetValue(process, null);
-            list.RemoveHandler(obj, list[obj]);
+            RemoveHandler(process, "_onExited");
+            RemoveHandler(process, "onExited");
+        }
+
+        private static void RemoveHandler(Process process, string fieldId)
+        {
+            var eventField = typeof(Process).GetField(fieldId, BindingFlags.NonPublic | BindingFlags.Instance);
+
+            if (eventField != null)
+            {
+                object obj = eventField.GetValue(process);
+                var pi = process.GetType().GetProperty("Events", BindingFlags.NonPublic | BindingFlags.Instance);
+                var list = (EventHandlerList)pi.GetValue(process, null);
+                list.RemoveHandler(obj, list[obj]);
+            }
         }
     }
 }

lib/PuppeteerSharp/Launcher.cs

@@ -129,6 +129,7 @@ public async Task<Browser> LaunchAsync(LaunchOptions options, int chromiumRevisi
 
             _chromeProcess = new Process();
             _chromeProcess.EnableRaisingEvents = true;
+            _chromeProcess.StartInfo.UseShellExecute = false;
             _chromeProcess.StartInfo.FileName = chromeExecutable;
             _chromeProcess.StartInfo.Arguments = string.Join(" ", chromeArguments);
 

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>0.3.0</PackageVersion>
+    <PackageVersion>0.3.1</PackageVersion>
     <Authors>Darío Kondratiuk</Authors>
     <Owners>Darío Kondratiuk</Owners>
     <PackageProjectUrl>https://github.com/kblok/puppeteer-sharp</PackageProjectUrl>
@@ -12,9 +12,10 @@
     <Title>PuppeteerSharp</Title>
     <Description>Headless Chrome .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
-    <PackageReleaseNotes>* 0.3: Process improvements, User data dir support
-* 0.1: PDF and Screenshots support</PackageReleaseNotes>
-    <ReleaseVersion>0.3</ReleaseVersion>
+    <PackageReleaseNotes>* 0.3.1 : .NET Framework Support
+* 0.3.0 : Process improvements, User data dir support
+* 0.1.0 : PDF and Screenshots support</PackageReleaseNotes>
+    <ReleaseVersion>0.3.1</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <ItemGroup>

lib/PuppeteerSharp/Session.cs

@@ -26,7 +26,7 @@ public Session(Connection connection, string targetId, string sessionId)
         #endregion
 
         #region Properties
-        public string TargetId { get; private set; }
+        public string TargetId { get; }
         public string SessionId { get; private set; }
         public Connection Connection { get; private set; }
         public event EventHandler<MessageEventArgs> MessageReceived;
@@ -40,9 +40,9 @@ public async Task<T> SendAsync<T>(string method, dynamic args = null)
             return JsonConvert.DeserializeObject<T>(content);
         }
 
-        public async Task<dynamic> SendAsync(string method, dynamic args = null)
+        public Task<dynamic> SendAsync(string method, dynamic args = null)
         {
-            return await SendAsync(method, false, args);
+            return SendAsync(method, false, args);
         }
 
         public async Task<dynamic> SendAsync(string method, bool rawContent, dynamic args = null)