diff --git a/.nuget/packages.config b/.nuget/packages.config
index eeefcb5..dc30c37 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,14 +1,8 @@
-
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
index ae51410..67f5bf7 100644
--- a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
+++ b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
@@ -51,8 +51,7 @@
-
- False
+
..\packages\Topshelf.3.1.4\lib\net40-full\Topshelf.dll
diff --git a/TimberWinR.ServiceHost/packages.config b/TimberWinR.ServiceHost/packages.config
index baeabe2..9c00afb 100644
--- a/TimberWinR.ServiceHost/packages.config
+++ b/TimberWinR.ServiceHost/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj b/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
index 62063ad..054b43b 100644
--- a/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
+++ b/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
@@ -42,15 +42,13 @@
..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
- True
False
..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll
True
-
- False
+
..\packages\NUnit.2.6.4\lib\nunit.framework.dll
diff --git a/TimberWinR.UnitTests/packages.config b/TimberWinR.UnitTests/packages.config
index c5a1df5..2fcee0b 100644
--- a/TimberWinR.UnitTests/packages.config
+++ b/TimberWinR.UnitTests/packages.config
@@ -1,6 +1,6 @@
-
+
-
+
\ No newline at end of file
diff --git a/TimberWinR/Outputs/Redis.cs b/TimberWinR/Outputs/Redis.cs
index f0d21e3..ef0e150 100644
--- a/TimberWinR/Outputs/Redis.cs
+++ b/TimberWinR/Outputs/Redis.cs
@@ -6,7 +6,7 @@ using System.Linq.Expressions;
using System.Net.Sockets;
using System.Text;
using System.Threading;
-using ctstone.Redis;
+using CSRedis;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
@@ -150,7 +150,8 @@ namespace TimberWinR.Outputs
{
try
{
- RedisClient client = new RedisClient(_redisHosts[_redisHostIndex], _port, _timeout);
+ RedisClient client = new RedisClient(_redisHosts[_redisHostIndex], _port);
+ client.SendTimeout = _timeout;
return client;
}
catch (Exception)
diff --git a/TimberWinR/TimberWinR.csproj b/TimberWinR/TimberWinR.csproj
index 7fcfa17..32366eb 100644
--- a/TimberWinR/TimberWinR.csproj
+++ b/TimberWinR/TimberWinR.csproj
@@ -35,11 +35,9 @@
..\packages\csredis.3.2.1\lib\net40\csredis.dll
- True
- ..\packages\Elasticsearch.Net.1.4.2\lib\Elasticsearch.Net.dll
- True
+ ..\packages\Elasticsearch.Net.1.3.1\lib\Elasticsearch.Net.dll
False
@@ -48,18 +46,16 @@
..\packages\MaxMind.Db.1.0.0.0\lib\net40\MaxMind.Db.dll
- True
..\packages\MaxMind.GeoIP2.2.1.0.0\lib\net40\MaxMind.GeoIP2.dll
- True
- ..\packages\NEST.1.4.2\lib\Nest.dll
- True
+ ..\packages\NEST.1.3.1\lib\Nest.dll
- ..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll
+ False
+ ..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll
False
@@ -69,8 +65,7 @@
..\packages\RapidRegex.Core.1.0.0.2\lib\net40\RapidRegex.Core.dll
- ..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll
- True
+ ..\packages\RestSharp.105.0.0\lib\net4\RestSharp.dll
diff --git a/TimberWinR/packages.config b/TimberWinR/packages.config
index 1bfdc1f..b01df7f 100644
--- a/TimberWinR/packages.config
+++ b/TimberWinR/packages.config
@@ -1,13 +1,13 @@
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/chocolateyUninstall.ps1.template b/chocolateyUninstall.ps1.template
index 7659c85..d776fd7 100644
--- a/chocolateyUninstall.ps1.template
+++ b/chocolateyUninstall.ps1.template
@@ -1,7 +1,7 @@
$packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages
$installerType = 'msi' #only one of these: exe, msi, msu
$url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url
-$silentArgs = '${PROJECTGUID} /quiet'
+$silentArgs = '{D066A694-B9F7-4B35-BB7D-D34CB88CA89F} /quiet'
$validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx
UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes