huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change #ifdefs

This commit is contained in:
Henk Mollema 2016-01-02 10:41:08 +01:00
parent 97a5149dd9
commit e81c5adce2
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/TaskUtilities.cs
View File

@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
{ {
public static class TaskUtilities public static class TaskUtilities
{ {
#if DOTNET5_4 || DNXCORE50 #if DOTNET5_4
public static Task CompletedTask = Task.CompletedTask; public static Task CompletedTask = Task.CompletedTask;
#else #else
public static Task CompletedTask = Task.FromResult<object>(null); public static Task CompletedTask = Task.FromResult<object>(null);

7
src/Microsoft.AspNet.Server.Kestrel/Networking/Libuv.cs
View File

@ -12,12 +12,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
{ {
IsWindows = PlatformApis.IsWindows; IsWindows = PlatformApis.IsWindows;
var isDarwinMono = var isDarwinMono = !IsWindows && PlatformApis.IsDarwin;
#if DNX451
IsWindows ? false : PlatformApis.IsDarwin;
#else
false;
#endif
if (isDarwinMono) if (isDarwinMono)
{ {

2
src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
{ {
static PlatformApis() static PlatformApis()
{ {
#if DOTNET5_4 || DNXCORE50 #if DOTNET5_4
IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
IsDarwin = RuntimeInformation.IsOSPlatform(OSPlatform.OSX); IsDarwin = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
#else #else