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

Updating packages to use generations

This commit is contained in:
Pranav K 2015-10-22 14:48:42 -07:00
parent a1e4e022b9
commit dea782163d
7 changed files with 78 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.AspNet.Server.Kestrel.Https/project.json
View File

@ -1,14 +1,14 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Adds HTTPS support to Kestrel", "description": "Adds HTTPS support to Kestrel",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/kestrelhttpserver" "url": "git://github.com/aspnet/kestrelhttpserver"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { } "net451": { }
} }
} }

8
src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if DNX451 #if NET451
using System; using System;
#endif #endif
using System.IO; using System.IO;
@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
} }
} }
#if DNX451 #if NET451
public override void Close() public override void Close()
{ {
_requestStream.Close(); _requestStream.Close();
@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return _responseStream.FlushAsync(cancellationToken); return _responseStream.FlushAsync(cancellationToken);
} }
#if DNX451 #if NET451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
return _requestStream.BeginRead(buffer, offset, count, callback, state); return _requestStream.BeginRead(buffer, offset, count, callback, state);
@ -146,7 +146,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken); return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken);
} }
#if DNX451 #if NET451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
return _responseStream.BeginWrite(buffer, offset, count, callback, state); return _responseStream.BeginWrite(buffer, offset, count, callback, state);

2
src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return ReadAsync(buffer, offset, count).Result; return ReadAsync(buffer, offset, count).Result;
} }
#if DNX451 #if NET451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{ {
var task = ReadAsync(buffer, offset, count, CancellationToken.None, state); var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);

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

@ -67,7 +67,7 @@ namespace Microsoft.AspNet.Server.Kestrel
Post(OnStopImmediate, null); Post(OnStopImmediate, null);
if (!_thread.Join((int)timeout.TotalMilliseconds)) if (!_thread.Join((int)timeout.TotalMilliseconds))
{ {
#if DNX451 #if NET451
_thread.Abort(); _thread.Abort();
#endif #endif
} }

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

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
{ {
public static bool IsWindows() public static bool IsWindows()
{ {
#if DNXCORE50 #if DOTNET5_4 || DNXCORE50
// Until Environment.OSVersion.Platform is exposed on .NET Core, we // Until Environment.OSVersion.Platform is exposed on .NET Core, we
// try to call uname and if that fails we assume we are on Windows. // try to call uname and if that fails we assume we are on Windows.
return GetUname() == string.Empty; return GetUname() == string.Empty;

27
src/Microsoft.AspNet.Server.Kestrel/project.json
View File

@ -16,7 +16,7 @@
}, },
"Microsoft.AspNet.Internal.libuv-Darwin": { "Microsoft.AspNet.Internal.libuv-Darwin": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type":"build" "type": "build"
}, },
"Microsoft.AspNet.Internal.libuv-Windows": { "Microsoft.AspNet.Internal.libuv-Windows": {
"version": "1.0.0-*", "version": "1.0.0-*",
@ -25,6 +25,7 @@
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": { },
"net451": { },
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
@ -44,6 +45,26 @@
"System.Threading.ThreadPool": "4.0.10-beta-*", "System.Threading.ThreadPool": "4.0.10-beta-*",
"System.Threading.Timer": "4.0.1-beta-*" "System.Threading.Timer": "4.0.1-beta-*"
} }
},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
"System.Diagnostics.Tracing": "4.0.21-beta-*",
"System.Globalization": "4.0.11-beta-*",
"System.IO": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*",
"System.Net.Primitives": "4.0.11-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.InteropServices": "4.0.21-beta-*",
"System.Text.Encoding": "4.0.11-beta-*",
"System.Threading": "4.0.11-beta-*",
"System.Threading.Tasks": "4.0.11-beta-*",
"System.Threading.Thread": "4.0.0-beta-*",
"System.Threading.ThreadPool": "4.0.10-beta-*",
"System.Threading.Timer": "4.0.1-beta-*"
}
} }
}, },
"compilationOptions": { "compilationOptions": {
@ -64,6 +85,6 @@
"runtimes/win7-x64/native/": "runtimes/win7-x64/native/*", "runtimes/win7-x64/native/": "runtimes/win7-x64/native/*",
"runtimes/win7-x86/native/": "runtimes/win7-x86/native/*", "runtimes/win7-x86/native/": "runtimes/win7-x86/native/*",
"runtimes/win10-arm/native/": "runtimes/win10-arm/native/*", "runtimes/win10-arm/native/": "runtimes/win10-arm/native/*",
"runtimes/osx/native/": "runtimes/osx/native/*" "runtimes/osx/native/": "runtimes/osx/native/*"
} }
} }

54
tools/Microsoft.StandardsPolice/project.json
View File

@ -1,28 +1,40 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Microsoft.StandardsPolice Class Library", "description": "Microsoft.StandardsPolice Class Library",
"dependencies": { "dependencies": {
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*" "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
},
"commands": {
"Microsoft.StandardsPolice": "Microsoft.StandardsPolice"
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Text.Encoding": "",
"System.Threading.Tasks": ""
}
}, },
"dnx451": {
"commands": { "frameworkAssemblies": {
"Microsoft.StandardsPolice": "Microsoft.StandardsPolice" "System.Runtime": "",
"System.Text.Encoding": "",
"System.Threading.Tasks": ""
}
}, },
"dotnet5.4": {
"frameworks": { "dependencies": {
"dnx451": { "System.Console": "4.0.0-beta-*"
"frameworkAssemblies": { }
"System.Runtime": "", },
"System.Text.Encoding": "", "dnxcore50": {
"System.Threading.Tasks": "" "dependencies": {
} "System.Console": "4.0.0-beta-*"
}, }
"dnxcore50": {
"dependencies": {
"System.Console": "4.0.0-beta-*"
}
}
} }
}
} }