Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
StackExchange.Redis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
StackExchange.Redis
Commits
056a6e44
Commit
056a6e44
authored
Jun 29, 2016
by
Nick Craver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.NET Core RTM update
Note: we still have unit test fails here, but checking in a working build.
parent
14b6d7e2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
72 additions
and
57 deletions
+72
-57
project.json
BasicTest_dnxcore50/project.json
+1
-1
project.json
StackExchange.Redis.StrongName/project.json
+22
-14
Cluster.cs
StackExchange.Redis.Tests/Cluster.cs
+4
-7
Program.cs
StackExchange.Redis.Tests/Program.cs
+1
-1
project.json
StackExchange.Redis.Tests/project.json
+20
-18
PhysicalConnection.cs
...kExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
+1
-1
project.json
StackExchange.Redis/project.json
+22
-14
global.json
global.json
+1
-1
No files found.
BasicTest_dnxcore50/project.json
View file @
056a6e44
...
...
@@ -24,7 +24,7 @@
},
"imports"
:
[
"dnxcore50"
],
"dependencies"
:
{
"System.Console"
:
"4.0.0
-rc2-24027
"
"System.Console"
:
"4.0.0"
}
}
}
...
...
StackExchange.Redis.StrongName/project.json
View file @
056a6e44
...
...
@@ -65,20 +65,28 @@
"define"
:
[
"PLAT_SAFE_CONTINUATIONS"
,
"CORE_CLR"
]
},
"dependencies"
:
{
"NETStandard.Library"
:
"1.5.0-rc2-24027"
,
"System.Collections.NonGeneric"
:
"4.0.1-rc2-24027"
,
"System.IO.FileSystem"
:
"4.0.1-rc2-24027"
,
"System.Net.NameResolution"
:
"4.0.0-rc2-24027"
,
"System.Net.Security"
:
"4.0.0-rc2-24027"
,
"System.Net.Sockets"
:
"4.1.0-rc2-24027"
,
"System.Reflection.Emit"
:
"4.0.1-rc2-24027"
,
"System.Reflection.Emit.Lightweight"
:
"4.0.1-rc2-24027"
,
"System.Reflection.TypeExtensions"
:
"4.1.0-rc2-24027"
,
"System.Security.Cryptography.Algorithms"
:
"4.1.0-rc2-24027"
,
"System.Security.Cryptography.X509Certificates"
:
"4.1.0-rc2-24027"
,
"System.Threading.Thread"
:
"4.0.0-rc2-24027"
,
"System.Threading.ThreadPool"
:
"4.0.10-rc2-24027"
,
"System.Threading.Timer"
:
"4.0.1-rc2-24027"
"System.Collections"
:
"4.0.11"
,
"System.Collections.Concurrent"
:
"4.0.12"
,
"System.Collections.NonGeneric"
:
"4.0.1"
,
"System.Diagnostics.Tools"
:
"4.0.1"
,
"System.IO.Compression"
:
"4.1.0"
,
"System.IO.FileSystem"
:
"4.0.1"
,
"System.Linq"
:
"4.1.0"
,
"System.Net.NameResolution"
:
"4.0.0"
,
"System.Net.Security"
:
"4.0.0"
,
"System.Net.Sockets"
:
"4.1.0"
,
"System.Reflection.Emit"
:
"4.0.1"
,
"System.Reflection.Emit.Lightweight"
:
"4.0.1"
,
"System.Reflection.TypeExtensions"
:
"4.1.0"
,
"System.Runtime.Extensions"
:
"4.1.0"
,
"System.Runtime.InteropServices.RuntimeInformation"
:
"4.0.0"
,
"System.Security.Cryptography.Algorithms"
:
"4.2.0"
,
"System.Security.Cryptography.X509Certificates"
:
"4.1.0"
,
"System.Text.RegularExpressions"
:
"4.1.0"
,
"System.Threading"
:
"4.0.11"
,
"System.Threading.Thread"
:
"4.0.0"
,
"System.Threading.ThreadPool"
:
"4.0.10"
,
"System.Threading.Timer"
:
"4.0.1"
}
}
}
...
...
StackExchange.Redis.Tests/Cluster.cs
View file @
056a6e44
...
...
@@ -13,17 +13,14 @@ namespace StackExchange.Redis.Tests
public
class
Cluster
:
TestBase
{
//private const string ClusterIp = "192.168.0.15"; // marc
private
const
string
ClusterIp
=
"10.110.11.102"
;
// kmontrose
//private const string ClusterIp = "10.110.11.102"; // kmontrose
private
const
string
ClusterIp
=
"127.0.0.1"
;
private
const
int
ServerCount
=
6
,
FirstPort
=
7000
;
protected
override
string
GetConfiguration
()
{
var
server
=
ClusterIp
;
#if !CORE_CLR
if
(
string
.
Equals
(
Environment
.
MachineName
,
"MARC-LAPTOP"
,
StringComparison
.
InvariantCultureIgnoreCase
))
#else
if
(
string
.
Equals
(
Environment
.
GetEnvironmentVariable
(
"COMPUTERNAME"
),
"MARC-LAPTOP"
,
StringComparison
.
OrdinalIgnoreCase
))
#endif
var
server
=
ClusterIp
;
if
(
string
.
Equals
(
Environment
.
MachineName
,
"MARC-LAPTOP"
,
StringComparison
.
OrdinalIgnoreCase
))
{
server
=
"192.168.56.101"
;
}
...
...
StackExchange.Redis.Tests/Program.cs
View file @
056a6e44
#if NUNITLITE
#if NUNITLITE
&& !CORE_CLR
using
System
;
using
System.Reflection
;
using
NUnit.Common
;
...
...
StackExchange.Redis.Tests/project.json
View file @
056a6e44
...
...
@@ -5,31 +5,33 @@
"StackExchange.Redis"
:
{
"version"
:
"1.1.*"
,
"target"
:
"project"
}
},
"commands"
:
{
"run"
:
"StackExchange.Redis.Tests"
},
"buildOptions"
:
{
"define"
:
[
"NUNITLITE"
],
"emitEntryPoint"
:
true
},
"runtimes"
:
{
"win81-x64"
:
{}
},
"nunit"
:
"3.4.0"
,
"dotnet-test-nunit"
:
"3.4.0-alpha-2"
},
"testRunner"
:
"nunit"
,
"frameworks"
:
{
"netcoreapp1.0"
:
{
"imports"
:
[
"dnxcore50"
],
"imports"
:
[
"dnxcore50"
,
"netcoreapp1.0"
,
"portable-net45+win8"
],
"buildOptions"
:
{
"define"
:
[
"PLAT_SAFE_CONTINUATIONS"
,
"CORE_CLR"
]
},
"dependencies"
:
{
"System.Console"
:
"4.0.0-rc2-24027"
,
"System.Linq.Expressions"
:
"4.0.11-rc2-24027"
,
"System.Reflection.Extensions"
:
"4.0.1-rc2-24027"
,
"System.Threading.Tasks.Parallel"
:
"4.0.1-rc2-24027"
,
"Microsoft.CSharp"
:
"4.0.1-rc2-24027"
,
"nunitlite"
:
"3.2.1"
"Microsoft.NETCore.App"
:
{
"version"
:
"1.0.0-*"
,
"type"
:
"platform"
},
"System.Console"
:
"4.0.0"
,
"System.Diagnostics.Debug"
:
"4.0.11"
,
"System.Linq.Expressions"
:
"4.1.0"
,
"System.Reflection.Extensions"
:
"4.0.1"
,
"System.Runtime.InteropServices"
:
"4.1.0"
,
"System.Threading.Tasks.Parallel"
:
"4.0.1"
,
"Microsoft.CSharp"
:
"4.0.1"
}
}
}
...
...
StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
View file @
056a6e44
...
...
@@ -690,7 +690,7 @@ void BeginReading()
Multiplexer
.
Trace
(
"Beginning async read..."
,
physicalName
);
#if CORE_CLR
var
result
=
netStream
.
ReadAsync
(
ioBuffer
,
ioBufferBytes
,
space
);
switch
(
result
.
Status
)
switch
(
result
.
Status
)
{
case
TaskStatus
.
RanToCompletion
:
case
TaskStatus
.
Faulted
:
...
...
StackExchange.Redis/project.json
View file @
056a6e44
...
...
@@ -51,20 +51,28 @@
"define"
:
[
"PLAT_SAFE_CONTINUATIONS"
,
"CORE_CLR"
]
},
"dependencies"
:
{
"NETStandard.Library"
:
"1.5.0-rc2-24027"
,
"System.Collections.NonGeneric"
:
"4.0.1-rc2-24027"
,
"System.IO.FileSystem"
:
"4.0.1-rc2-24027"
,
"System.Net.NameResolution"
:
"4.0.0-rc2-24027"
,
"System.Net.Security"
:
"4.0.0-rc2-24027"
,
"System.Net.Sockets"
:
"4.1.0-rc2-24027"
,
"System.Reflection.Emit"
:
"4.0.1-rc2-24027"
,
"System.Reflection.Emit.Lightweight"
:
"4.0.1-rc2-24027"
,
"System.Reflection.TypeExtensions"
:
"4.1.0-rc2-24027"
,
"System.Security.Cryptography.Algorithms"
:
"4.1.0-rc2-24027"
,
"System.Security.Cryptography.X509Certificates"
:
"4.1.0-rc2-24027"
,
"System.Threading.Thread"
:
"4.0.0-rc2-24027"
,
"System.Threading.ThreadPool"
:
"4.0.10-rc2-24027"
,
"System.Threading.Timer"
:
"4.0.1-rc2-24027"
"System.Collections"
:
"4.0.11"
,
"System.Collections.Concurrent"
:
"4.0.12"
,
"System.Collections.NonGeneric"
:
"4.0.1"
,
"System.Diagnostics.Tools"
:
"4.0.1"
,
"System.IO.Compression"
:
"4.1.0"
,
"System.IO.FileSystem"
:
"4.0.1"
,
"System.Linq"
:
"4.1.0"
,
"System.Net.NameResolution"
:
"4.0.0"
,
"System.Net.Security"
:
"4.0.0"
,
"System.Net.Sockets"
:
"4.1.0"
,
"System.Reflection.Emit"
:
"4.0.1"
,
"System.Reflection.Emit.Lightweight"
:
"4.0.1"
,
"System.Reflection.TypeExtensions"
:
"4.1.0"
,
"System.Runtime.Extensions"
:
"4.1.0"
,
"System.Runtime.InteropServices.RuntimeInformation"
:
"4.0.0"
,
"System.Security.Cryptography.Algorithms"
:
"4.2.0"
,
"System.Security.Cryptography.X509Certificates"
:
"4.1.0"
,
"System.Text.RegularExpressions"
:
"4.1.0"
,
"System.Threading"
:
"4.0.11"
,
"System.Threading.Thread"
:
"4.0.0"
,
"System.Threading.ThreadPool"
:
"4.0.10"
,
"System.Threading.Timer"
:
"4.0.1"
}
}
}
...
...
global.json
View file @
056a6e44
{
"sdk"
:
{
"version"
:
"1.0.0-preview
1-002702
"
"version"
:
"1.0.0-preview
2-003121
"
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment