Skip to content

Commit

Permalink
testing CSRedis:develop tree against #ctstone/csredis#22
Browse files Browse the repository at this point in the history
  • Loading branch information
Hüseyin Uslu committed Sep 2, 2014
1 parent 6ea52ed commit fe54e3f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
19 changes: 18 additions & 1 deletion build/CoiniumServ.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{02E410C9-83C5-4D63-8902-5AD041EBEB6C}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonConfig", "..\deps\jsonc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoiniumServGui", "..\src\CoiniumServGui\CoiniumServGui.csproj", "{1E2AF218-156A-40A0-8DA3-95DD13D93810}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSRedis", "..\deps\csredis\CSRedis\CSRedis.csproj", "{D35E185E-A7E1-41E1-846C-21944F56074F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -120,6 +122,21 @@ Global
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|Mixed Platforms.ActiveCfg = Release|Any CPU
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|x86.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|x86.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Any CPU.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|x86.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Any CPU.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Any CPU.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Mixed Platforms.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion deps/csredis
Submodule csredis updated 55 files
+31 −17 CHANGELOG.md
+20 −11 CSRedis.Tests/CSRedis.Tests.csproj
+13 −11 CSRedis.Tests/ConnectionTests.cs
+36 −34 CSRedis.Tests/HashTests.cs
+8 −6 CSRedis.Tests/HyperLogLogTests.cs
+48 −46 CSRedis.Tests/KeyTests.cs
+40 −38 CSRedis.Tests/ListTests.cs
+18 −16 CSRedis.Tests/PubSubTests.cs
+26 −0 CSRedis.Tests/RegressionTests.cs
+16 −12 CSRedis.Tests/ScriptingTests.cs
+5 −3 CSRedis.Tests/SentinelTests.cs
+58 −56 CSRedis.Tests/ServerTests.cs
+32 −30 CSRedis.Tests/SetTests.cs
+48 −46 CSRedis.Tests/SortedSetTests.cs
+48 −46 CSRedis.Tests/StringTests.cs
+12 −10 CSRedis.Tests/TransactionTests.cs
+22 −6 CSRedis/CSRedis.csproj
+25 −2 CSRedis/Exceptions.cs
+2,105 −0 CSRedis/IRedisClient.cs
+2,080 −0 CSRedis/IRedisClientAsync.cs
+1 −1 CSRedis/Internal/Commands/RedisArray.cs
+1 −1 CSRedis/Internal/Commands/RedisBytes.cs
+12 −0 CSRedis/Internal/Commands/RedisObject.cs
+0 −118 CSRedis/Internal/DefaultConnector.cs
+81 −0 CSRedis/Internal/Fakes/FakeRedisSocket.cs
+49 −0 CSRedis/Internal/Fakes/FakeStream.cs
+170 −0 CSRedis/Internal/IO/AsyncConnector.cs
+43 −0 CSRedis/Internal/IO/RedisAsyncCommandToken.cs
+46 −0 CSRedis/Internal/IO/RedisIO.cs
+27 −23 CSRedis/Internal/IO/RedisReader.cs
+67 −0 CSRedis/Internal/IO/RedisSocket.cs
+25 −150 CSRedis/Internal/IO/RedisWriter.cs
+70 −0 CSRedis/Internal/IO/SocketAsyncPool.cs
+0 −24 CSRedis/Internal/IRedisConnector.cs
+0 −263 CSRedis/Internal/MockConnector.cs
+3 −3 CSRedis/Internal/MonitorListener.cs
+14 −8 CSRedis/Internal/RedisCommand.cs
+0 −244 CSRedis/Internal/RedisConnection.cs
+231 −0 CSRedis/Internal/RedisConnector.cs
+4 −4 CSRedis/Internal/RedisListener.cs
+14 −8 CSRedis/Internal/RedisPipeline.cs
+18 −18 CSRedis/Internal/RedisTransaction.cs
+1 −1 CSRedis/Internal/SubscriptionListener.cs
+1 −1 CSRedis/Internal/Utilities/RedisArgs.cs
+4 −4 CSRedis/Properties/AssemblyInfo.cs
+183 −183 CSRedis/RedisClient.Async.cs
+210 −202 CSRedis/RedisClient.Sync.cs
+96 −37 CSRedis/RedisClient.cs
+14 −14 CSRedis/RedisSentinelClient.Async.cs
+19 −19 CSRedis/RedisSentinelClient.Sync.cs
+28 −30 CSRedis/RedisSentinelClient.cs
+59 −23 CSRedis/RedisSentinelManager.cs
+0 −0 LICENSE
+40 −23 README.md
+ − csredis.pub.snk
8 changes: 4 additions & 4 deletions src/CoiniumServ/CoiniumServ.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\CryptSharpOfficial.2.0.0.0\lib\CryptSharp.dll</HintPath>
</Reference>
<Reference Include="csredis, Version=3.2.1.0, Culture=neutral, PublicKeyToken=1afd0264bbe4a44a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\csredis.3.2.1\lib\net40\csredis.dll</HintPath>
</Reference>
<Reference Include="Dapper, Version=1.34.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\Dapper.1.34\lib\net45\Dapper.dll</HintPath>
Expand Down Expand Up @@ -953,6 +949,10 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\deps\csredis\CSRedis\CSRedis.csproj">
<Project>{d35e185e-a7e1-41e1-846c-21944f56074f}</Project>
<Name>CSRedis</Name>
</ProjectReference>
<ProjectReference Include="..\..\deps\gibbed.io\Gibbed.IO.csproj">
<Project>{047857ba-daa3-4ca7-afb8-a1b082b28c6a}</Project>
<Name>Gibbed.IO</Name>
Expand Down

0 comments on commit fe54e3f

Please sign in to comment.