0.9.18

Author: mattqs

Src/EngineIoClientDotNet.mono/Client/Socket.cs

@@ -400,13 +400,25 @@ internal void OnDrain()
                 }
                 catch (ArgumentOutOfRangeException)
                 {
-                    //ignore
+                    WriteBuffer = WriteBuffer.Clear();
+                    CallbackBuffer = CallbackBuffer.Clear();
+                    PrevBufferLen = 0;
                 }
             }
             //log.Info(string.Format("OnDrain2 PrevBufferLen={0} WriteBuffer.Count={1}", PrevBufferLen, WriteBuffer.Count));
 
-            WriteBuffer = WriteBuffer.RemoveRange(0, PrevBufferLen);
-            CallbackBuffer = CallbackBuffer.RemoveRange(0, PrevBufferLen);
+
+            try
+            {
+                WriteBuffer = WriteBuffer.RemoveRange(0, PrevBufferLen);
+                CallbackBuffer = CallbackBuffer.RemoveRange(0, PrevBufferLen);
+            }
+            catch (Exception)
+            {
+                WriteBuffer = WriteBuffer.Clear();
+                CallbackBuffer = CallbackBuffer.Clear();
+            }
+           
 
             this.PrevBufferLen = 0;
             //log.Info(string.Format("OnDrain3 PrevBufferLen={0} WriteBuffer.Count={1}", PrevBufferLen, WriteBuffer.Count));

Src/EngineIoClientDotNet.net45/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit.runner.console" version="2.0.0" />
+</packages>

Src/EngineIoClientDotNet.net45/EngineIoClientDotNet.net45.sln

@@ -1,11 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.net45", "EngineIoClientDotNet.net45.csproj", "{842D8B13-DAF3-4919-80A0-03EFA3C17178}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt", "..\..\grunt\", "{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(1)", "..\..\grunt\", "{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}"
 	ProjectSection(WebsiteProperties) = preProject
-		Frontpage = "false"
 		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		Debug.AspNetCompiler.VirtualPath = "/grunt"
 		Debug.AspNetCompiler.PhysicalPath = "..\..\grunt\"
@@ -22,9 +23,10 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt", "..\..\grunt\", "{7
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
 		VWDPort = "8678"
+		SlnRelativePath = "..\..\grunt\"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "TestServer", "..\..\TestServer\", "{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "TestServer(1)", "..\..\TestServer\", "{7E50397C-1221-49A9-A5F1-8254AC4BFBA4}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		Debug.AspNetCompiler.VirtualPath = "/TestServer"
@@ -42,10 +44,16 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "TestServer", "..\..\TestSer
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
 		VWDPort = "8671"
+		SlnRelativePath = "..\..\TestServer\"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net45", "..\EngineIoClientDotNet.Tests.net45\EngineIoClientDotNet.Tests.net45.csproj", "{BEFF0675-8A73-4012-9651-C253E06E0F87}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{238B4362-A8D9-40BC-863F-236FFD88643D}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

grunt/Gruntfile.js

@@ -2,7 +2,9 @@
 module.exports = function (grunt) {
   var
     node_os = require('os'),
-    config = require('./config.json'),
+    fs = require('fs'),
+    strip_json = require('strip-json-comments'),
+    config = JSON.parse(strip_json(String(fs.readFileSync('./config.json')))),
     util = require('util'),
     os = node_os.platform() === 'win32' ? 'win' : 'linux',
     nuget_builds = [

grunt/config.json

@@ -1,4 +1,4 @@
-{  
+{  
   "version":"0.9.18",
   "server":{  
     "port":80,
@@ -7,12 +7,13 @@
   },
   "win":{  
     "powershell":"C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe",
-    "msbuild":"C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe",
-    "xunit_path":"C:/ProgramData/chocolatey/bin",
+    "msbuild": "C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe",
+    //    "xunit_path":"C:/ProgramData/chocolatey/bin",
+    "xunit_path":"C:/Development/quobject.visualstudio.com/EngineIoClientDotNet/Src/EngineIoClientDotNet.net45/packages/xunit.runner.console.2.0.0/tools/",
     "nuget":"C:/ProgramData/chocolatey/bin/NuGet.exe"
   },
   "linux":{  
     "msbuild":"xbuild",
     "xunit_path":"/home/apollo/vendors/xunit"
   }
-}
+} 

grunt/package.json

@@ -18,6 +18,7 @@
     "string-formatter": "^0.2.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-copy": "^0.5.0",
-    "rimraf": "^2.2.8"
+    "rimraf": "^2.2.8",
+    "strip-json-comments": "^0.1.1"
   }
 }