Skip to content

S
StackExchange.Redis
Commit dde9424d authored by MichaC's avatar MichaC
Browse files
Options

Using RuntimeInformation.IsOSPlatform for dotnet5.x builds

parent 59ace8ff
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 228 deletions
StackExchange.Redis.StrongName/project.json
View file @ dde9424d
{ {
"version": "1.1.0-alpha2", "version": "1.1.0-alpha2",
"description": "High performance Redis client, incorporating both synchronous and asynchronous usage.", "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
"authors": [ "Stack Exchange inc., marc.gravell" ], "authors": [ "Stack Exchange inc., marc.gravell" ],
"owners": [ "marc.gravell" ], "owners": [ "marc.gravell" ],
"tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ], "tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ],
"projectUrl": "https://github.com/StackExchange/StackExchange.Redis", "projectUrl": "https://github.com/StackExchange/StackExchange.Redis",
"licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE", "licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE",
"copyright": "Stack Exchange inc. 2014-", "copyright": "Stack Exchange inc. 2014-",
"requireLicenseAcceptance": false, "requireLicenseAcceptance": false,
"summary": "Redis client library", "summary": "Redis client library",
"releaseNotes": "Alpha for core-clr; if you aren't doing core-clr, you probably don't want this", "releaseNotes": "Alpha for core-clr; if you aren't doing core-clr, you probably don't want this",
"compile": [ "compile": [
"../StackExchange.Redis/**/*.cs" "../StackExchange.Redis/**/*.cs"
], ],
"dependencies": { "dependencies": {
}, },
"compilationOptions": { "compilationOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"keyFile": "../StackExchange.Redis.snk", "keyFile": "../StackExchange.Redis.snk",
"define": [ "STRONG_NAME" ] "define": [ "STRONG_NAME" ]
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
"dependencies": { "dependencies": {
"Microsoft.Bcl": "1.1.10", "Microsoft.Bcl": "1.1.10",
"Microsoft.Bcl.Async": "1.0.168" "Microsoft.Bcl.Async": "1.0.168"
}, },
"compilationOptions": { "compilationOptions": {
"define": [ "FEATURE_SERIALIZATION" ] "define": [ "FEATURE_SERIALIZATION" ]
} }
}, },
"net45": { "net45": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO.Compression": "4.0.0.0" "System.IO.Compression": "4.0.0.0"
}, },
"compilationOptions": { "compilationOptions": {
"define": [ "FEATURE_SERIALIZATION" ] "define": [ "FEATURE_SERIALIZATION" ]
} }
}, },
"net46": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO.Compression": "4.0.0.0" "System.IO.Compression": "4.0.0.0"
}, },
"define": [ "FEATURE_SERIALIZATION", "PLAT_SAFE_CONTINUATIONS" ] "define": [ "FEATURE_SERIALIZATION", "PLAT_SAFE_CONTINUATIONS" ]
}, },
"dnxcore50": { "dnxcore50": {
"compilationOptions": { "compilationOptions": {
"define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ] "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
}, },
"dependencies": { "dependencies": {
"System.Collections.Concurrent": "4.0.11-beta-23516", "System.Collections.Concurrent": "4.0.11-beta-23516",
"System.Collections.NonGeneric": "4.0.1-beta-23516", "System.Collections.NonGeneric": "4.0.1-beta-23516",
"System.Diagnostics.Debug": "4.0.11-beta-23516", "System.Diagnostics.Debug": "4.0.11-beta-23516",
"System.Diagnostics.Tools": "4.0.1-beta-23516", "System.Diagnostics.Tools": "4.0.1-beta-23516",
"System.Diagnostics.TraceSource": "4.0.0-beta-23516", "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
"System.Globalization": "4.0.11-beta-23516", "System.Globalization": "4.0.11-beta-23516",
"System.IO": "4.0.11-beta-23516", "System.IO": "4.0.11-beta-23516",
"System.IO.Compression": "4.1.0-beta-23516", "System.IO.Compression": "4.1.0-beta-23516",
"System.IO.FileSystem": "4.0.1-beta-23516", "System.IO.FileSystem": "4.0.1-beta-23516",
"System.Linq": "4.0.1-beta-23516", "System.Linq": "4.0.1-beta-23516",
"System.Net.NameResolution": "4.0.0-beta-23516", "System.Net.NameResolution": "4.0.0-beta-23516",
"System.Net.Primitives": "4.0.11-beta-23516", "System.Net.Primitives": "4.0.11-beta-23516",
"System.Net.Security": "4.0.0-beta-23516", "System.Net.Security": "4.0.0-beta-23516",
"System.Net.Sockets": "4.1.0-beta-23516", "System.Net.Sockets": "4.1.0-beta-23516",
"System.Reflection": "4.1.0-beta-23516", "System.Reflection": "4.1.0-beta-23516",
"System.Reflection.Emit": "4.0.1-beta-23516", "System.Reflection.Emit": "4.0.1-beta-23516",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
"System.Reflection.Primitives": "4.0.1-beta-23516", "System.Reflection.Primitives": "4.0.1-beta-23516",
"System.Reflection.TypeExtensions": "4.1.0-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23516", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
"System.Text.Encoding": "4.0.11-beta-23516", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516", "System.Text.Encoding": "4.0.11-beta-23516",
"System.Threading": "4.0.11-beta-23516", "System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading.Tasks": "4.0.11-beta-23516", "System.Threading": "4.0.11-beta-23516",
"System.Threading.Thread": "4.0.0-beta-23516", "System.Threading.Tasks": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516", "System.Threading.Thread": "4.0.0-beta-23516",
"System.Threading.Timer": "4.0.1-beta-23516" "System.Threading.ThreadPool": "4.0.10-beta-23516",
} "System.Threading.Timer": "4.0.1-beta-23516"
}, }
"dotnet5.5": { },
"compilationOptions": { "dotnet5.5": {
"define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ] "compilationOptions": {
}, "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
"dependencies": { },
"System.Collections.Concurrent": "4.0.11-beta-23516", "dependencies": {
"System.Collections.NonGeneric": "4.0.1-beta-23516", "System.Collections.Concurrent": "4.0.11-beta-23516",
"System.Diagnostics.Debug": "4.0.11-beta-23516", "System.Collections.NonGeneric": "4.0.1-beta-23516",
"System.Diagnostics.Tools": "4.0.1-beta-23516", "System.Diagnostics.Debug": "4.0.11-beta-23516",
"System.Diagnostics.TraceSource": "4.0.0-beta-23516", "System.Diagnostics.Tools": "4.0.1-beta-23516",
"System.Globalization": "4.0.11-beta-23516", "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
"System.IO": "4.0.11-beta-23516", "System.Globalization": "4.0.11-beta-23516",
"System.IO.Compression": "4.1.0-beta-23516", "System.IO": "4.0.11-beta-23516",
"System.IO.FileSystem": "4.0.1-beta-23516", "System.IO.Compression": "4.1.0-beta-23516",
"System.Linq": "4.0.1-beta-23516", "System.IO.FileSystem": "4.0.1-beta-23516",
"System.Net.NameResolution": "4.0.0-beta-23516", "System.Linq": "4.0.1-beta-23516",
"System.Net.Primitives": "4.0.11-beta-23516", "System.Net.NameResolution": "4.0.0-beta-23516",
"System.Net.Security": "4.0.0-beta-23516", "System.Net.Primitives": "4.0.11-beta-23516",
"System.Net.Sockets": "4.1.0-beta-23516", "System.Net.Security": "4.0.0-beta-23516",
"System.Reflection": "4.1.0-beta-23516", "System.Net.Sockets": "4.1.0-beta-23516",
"System.Reflection.Emit": "4.0.1-beta-23516", "System.Reflection": "4.1.0-beta-23516",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.Emit": "4.0.1-beta-23516",
"System.Reflection.Primitives": "4.0.1-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
"System.Reflection.TypeExtensions": "4.1.0-beta-23516", "System.Reflection.Primitives": "4.0.1-beta-23516",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516",
"System.Text.Encoding": "4.0.11-beta-23516", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
"System.Threading": "4.0.11-beta-23516", "System.Text.Encoding": "4.0.11-beta-23516",
"System.Threading.Tasks": "4.0.11-beta-23516", "System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading.Thread": "4.0.0-beta-23516", "System.Threading": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516", "System.Threading.Tasks": "4.0.11-beta-23516",
"System.Threading.Timer": "4.0.1-beta-23516" "System.Threading.Thread": "4.0.0-beta-23516",
} "System.Threading.ThreadPool": "4.0.10-beta-23516",
} "System.Threading.Timer": "4.0.1-beta-23516"
} }
}
}
} }
\ No newline at end of file
StackExchange.Redis/StackExchange/Redis/SocketManager.cs
View file @ dde9424d
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -265,11 +266,12 @@ internal void SetFastLoopbackOption(Socket socket) ...@@ -265,11 +266,12 @@ internal void SetFastLoopbackOption(Socket socket)
#else #else
try try
{ {
byte[] optionInValue = BitConverter.GetBytes(1); // Ioctl is not supported on other platforms at the moment
socket.IOControl(SIO_LOOPBACK_FAST_PATH, optionInValue, null); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
} {
catch (PlatformNotSupportedException) byte[] optionInValue = BitConverter.GetBytes(1);
{ socket.IOControl(SIO_LOOPBACK_FAST_PATH, optionInValue, null);
}
} }
catch (SocketException) catch (SocketException)
{ {
......
StackExchange.Redis/project.json
View file @ dde9424d
{ {
"version": "1.1.0-alpha2", "version": "1.1.0-alpha2",
"description": "High performance Redis client, incorporating both synchronous and asynchronous usage.", "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
"authors": [ "Stack Exchange inc., marc.gravell" ], "authors": [ "Stack Exchange inc., marc.gravell" ],
"owners": [ "marc.gravell" ], "owners": [ "marc.gravell" ],
"tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ], "tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ],
"projectUrl": "https://github.com/StackExchange/StackExchange.Redis", "projectUrl": "https://github.com/StackExchange/StackExchange.Redis",
"licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE", "licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE",
"copyright": "Stack Exchange inc. 2014-", "copyright": "Stack Exchange inc. 2014-",
"requireLicenseAcceptance": false, "requireLicenseAcceptance": false,
"summary": "Redis client library", "summary": "Redis client library",
"releaseNotes": "Alpha for core-clr; if you aren't doing core-clr, you probably don't want this", "releaseNotes": "Alpha for core-clr; if you aren't doing core-clr, you probably don't want this",
"dependencies": { "dependencies": {
}, },
"compilationOptions": { "compilationOptions": {
"allowUnsafe": true "allowUnsafe": true
}, },
"frameworks": { "frameworks": {
"net40": { "net40": {
"dependencies": { "dependencies": {
"Microsoft.Bcl": "1.1.10", "Microsoft.Bcl": "1.1.10",
"Microsoft.Bcl.Async": "1.0.168" "Microsoft.Bcl.Async": "1.0.168"
} }
}, },
"net45": { "net45": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO.Compression": "4.0.0.0" "System.IO.Compression": "4.0.0.0"
} }
}, },
"net46": { "net46": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO.Compression": "4.0.0.0" "System.IO.Compression": "4.0.0.0"
}, },
"define": [ "PLAT_SAFE_CONTINUATIONS" ] "define": [ "PLAT_SAFE_CONTINUATIONS" ]
}, },
"dnxcore50": { "dnxcore50": {
"compilationOptions": { "compilationOptions": {
"define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ] "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
}, },
"dependencies": { "dependencies": {
"System.Collections.Concurrent": "4.0.11-beta-23516", "System.Collections.Concurrent": "4.0.11-beta-23516",
"System.Collections.NonGeneric": "4.0.1-beta-23516", "System.Collections.NonGeneric": "4.0.1-beta-23516",
"System.Diagnostics.Debug": "4.0.11-beta-23516", "System.Diagnostics.Debug": "4.0.11-beta-23516",
"System.Diagnostics.Tools": "4.0.1-beta-23516", "System.Diagnostics.Tools": "4.0.1-beta-23516",
"System.Diagnostics.TraceSource": "4.0.0-beta-23516", "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
"System.Globalization": "4.0.11-beta-23516", "System.Globalization": "4.0.11-beta-23516",
"System.IO": "4.0.11-beta-23516", "System.IO": "4.0.11-beta-23516",
"System.IO.Compression": "4.1.0-beta-23516", "System.IO.Compression": "4.1.0-beta-23516",
"System.IO.FileSystem": "4.0.1-beta-23516", "System.IO.FileSystem": "4.0.1-beta-23516",
"System.Linq": "4.0.1-beta-23516", "System.Linq": "4.0.1-beta-23516",
"System.Net.NameResolution": "4.0.0-beta-23516", "System.Net.NameResolution": "4.0.0-beta-23516",
"System.Net.Primitives": "4.0.11-beta-23516", "System.Net.Primitives": "4.0.11-beta-23516",
"System.Net.Security": "4.0.0-beta-23516", "System.Net.Security": "4.0.0-beta-23516",
"System.Net.Sockets": "4.1.0-beta-23516", "System.Net.Sockets": "4.1.0-beta-23516",
"System.Reflection": "4.1.0-beta-23516", "System.Reflection": "4.1.0-beta-23516",
"System.Reflection.Emit": "4.0.1-beta-23516", "System.Reflection.Emit": "4.0.1-beta-23516",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
"System.Reflection.Primitives": "4.0.1-beta-23516", "System.Reflection.Primitives": "4.0.1-beta-23516",
"System.Reflection.TypeExtensions": "4.1.0-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23516", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
"System.Text.Encoding": "4.0.11-beta-23516", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516", "System.Text.Encoding": "4.0.11-beta-23516",
"System.Threading": "4.0.11-beta-23516", "System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading.Tasks": "4.0.11-beta-23516", "System.Threading": "4.0.11-beta-23516",
"System.Threading.Thread": "4.0.0-beta-23516", "System.Threading.Tasks": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516", "System.Threading.Thread": "4.0.0-beta-23516",
"System.Threading.Timer": "4.0.1-beta-23516" "System.Threading.ThreadPool": "4.0.10-beta-23516",
} "System.Threading.Timer": "4.0.1-beta-23516"
}, }
"dotnet5.5": { },
"compilationOptions": { "dotnet5.5": {
"define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ] "compilationOptions": {
}, "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
"dependencies": { },
"System.Collections.Concurrent": "4.0.11-beta-23516", "dependencies": {
"System.Collections.NonGeneric": "4.0.1-beta-23516", "System.Collections.Concurrent": "4.0.11-beta-23516",
"System.Diagnostics.Debug": "4.0.11-beta-23516", "System.Collections.NonGeneric": "4.0.1-beta-23516",
"System.Diagnostics.Tools": "4.0.1-beta-23516", "System.Diagnostics.Debug": "4.0.11-beta-23516",
"System.Diagnostics.TraceSource": "4.0.0-beta-23516", "System.Diagnostics.Tools": "4.0.1-beta-23516",
"System.Globalization": "4.0.11-beta-23516", "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
"System.IO": "4.0.11-beta-23516", "System.Globalization": "4.0.11-beta-23516",
"System.IO.Compression": "4.1.0-beta-23516", "System.IO": "4.0.11-beta-23516",
"System.IO.FileSystem": "4.0.1-beta-23516", "System.IO.Compression": "4.1.0-beta-23516",
"System.Linq": "4.0.1-beta-23516", "System.IO.FileSystem": "4.0.1-beta-23516",
"System.Net.NameResolution": "4.0.0-beta-23516", "System.Linq": "4.0.1-beta-23516",
"System.Net.Primitives": "4.0.11-beta-23516", "System.Net.NameResolution": "4.0.0-beta-23516",
"System.Net.Security": "4.0.0-beta-23516", "System.Net.Primitives": "4.0.11-beta-23516",
"System.Net.Sockets": "4.1.0-beta-23516", "System.Net.Security": "4.0.0-beta-23516",
"System.Reflection": "4.1.0-beta-23516", "System.Net.Sockets": "4.1.0-beta-23516",
"System.Reflection.Emit": "4.0.1-beta-23516", "System.Reflection": "4.1.0-beta-23516",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-23516", "System.Reflection.Emit": "4.0.1-beta-23516",
"System.Reflection.Primitives": "4.0.1-beta-23516", "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
"System.Reflection.TypeExtensions": "4.1.0-beta-23516", "System.Reflection.Primitives": "4.0.1-beta-23516",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23516", "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516",
"System.Text.Encoding": "4.0.11-beta-23516", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
"System.Text.RegularExpressions": "4.0.11-beta-23516", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
"System.Threading": "4.0.11-beta-23516", "System.Text.Encoding": "4.0.11-beta-23516",
"System.Threading.Tasks": "4.0.11-beta-23516", "System.Text.RegularExpressions": "4.0.11-beta-23516",
"System.Threading.Thread": "4.0.0-beta-23516", "System.Threading": "4.0.11-beta-23516",
"System.Threading.ThreadPool": "4.0.10-beta-23516", "System.Threading.Tasks": "4.0.11-beta-23516",
"System.Threading.Timer": "4.0.1-beta-23516" "System.Threading.Thread": "4.0.0-beta-23516",
} "System.Threading.ThreadPool": "4.0.10-beta-23516",
} "System.Threading.Timer": "4.0.1-beta-23516"
} }
}
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment