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

Switching to using generations TFM

This commit is contained in:
Pranav K 2015-10-21 21:10:18 -07:00
parent 9d7300c52b
commit 0219aabc17
16 changed files with 233 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNet.Html.Abstractions/project.json
View File

@ -12,9 +12,8 @@
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
},
"frameworks": {
"net45" : { },
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-beta-*"
}

9
src/Microsoft.AspNet.Http.Abstractions/project.json
View File

@ -10,12 +10,15 @@
},
"dependencies": {
"Microsoft.AspNet.Http.Features": "1.0.0-*",
"Microsoft.Extensions.ActivatorUtilities.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Extensions.ActivatorUtilities.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*",

4
src/Microsoft.AspNet.Http.Extensions/project.json
View File

@ -14,8 +14,8 @@
"Microsoft.Net.Http.Headers": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.IO.FileSystem": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*",

4
src/Microsoft.AspNet.Http.Features/project.json
View File

@ -12,8 +12,8 @@
"Microsoft.Extensions.Primitives": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*",

8
src/Microsoft.AspNet.Http/HttpContextAccessor.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
#if DNX451
#if NET451
using System.Runtime.Remoting.Messaging;
using System.Runtime.Remoting;
#elif DNXCORE50
#elif DOTNET5_4
using System.Threading;
#endif
@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal
{
public class HttpContextAccessor : IHttpContextAccessor
{
#if DNX451
#if NET451
private const string LogicalDataKey = "__HttpContext_Current__";
public HttpContext HttpContext
@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Http.Internal
}
}
#elif DNXCORE50
#elif DOTNET5_4
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
public HttpContext HttpContext
{

4
src/Microsoft.AspNet.Http/ReferenceReadStream.cs
View File

@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Http.Internal
_position += read;
return read;
}
#if DNX451
#if NET451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
ThrowIfDisposed();
@ -164,7 +164,7 @@ namespace Microsoft.AspNet.Http.Internal
{
throw new NotSupportedException();
}
#if DNX451
#if NET451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
throw new NotSupportedException();

4
src/Microsoft.AspNet.Http/project.json
View File

@ -15,8 +15,8 @@
"Microsoft.Net.Http.Headers": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Text.Encoding": "4.0.11-beta-*"

4
src/Microsoft.AspNet.Owin/project.json
View File

@ -12,8 +12,8 @@
"Microsoft.AspNet.Http": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.ComponentModel": "4.0.1-beta-*",

4
src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs
View File

@ -149,7 +149,7 @@ namespace Microsoft.AspNet.WebUtilities
{
_inner.Write(buffer, offset, count);
}
#if DNX451
#if NET451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
return _inner.BeginWrite(buffer, offset, count, callback, state);
@ -198,7 +198,7 @@ namespace Microsoft.AspNet.WebUtilities
return await _inner.ReadAsync(buffer, offset, count, cancellationToken);
}
#if DNX451
#if NET451
// We only anticipate using ReadAsync
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{

4
src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs
View File

@ -163,7 +163,7 @@ namespace Microsoft.AspNet.WebUtilities
return read;
}
#if DNX451
#if NET451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
ThrowIfDisposed();
@ -239,7 +239,7 @@ namespace Microsoft.AspNet.WebUtilities
{
throw new NotSupportedException();
}
#if DNX451
#if NET451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
throw new NotSupportedException();

4
src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs
View File

@ -119,7 +119,7 @@ namespace Microsoft.AspNet.WebUtilities
{
throw new NotSupportedException();
}
#if DNX451
#if NET451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
{
throw new NotSupportedException();
@ -157,7 +157,7 @@ namespace Microsoft.AspNet.WebUtilities
}
return read;
}
#if DNX451
#if NET451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
{
var tcs = new TaskCompletionSource<int>(state);

4
src/Microsoft.AspNet.WebUtilities/project.json
View File

@ -13,8 +13,8 @@
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*",

11
src/Microsoft.Extensions.BufferedHtmlContent.Sources/project.json
View File

@ -3,15 +3,8 @@
"shared": "*.cs",
"dependencies": {},
"frameworks": {
"net45": { },
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*"
}
},
"dotnet": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*"

5
src/Microsoft.Extensions.WebEncoders.Core/project.json
View File

@ -10,9 +10,8 @@
"warningsAsErrors": true
},
"frameworks": {
"net45": { },
"dnx451": { },
"dnxcore50": {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.ComponentModel": "4.0.1-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*",

5
src/Microsoft.Extensions.WebEncoders/project.json
View File

@ -14,8 +14,7 @@
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
},
"frameworks": {
"net45": { },
"dnx451": { },
"dnxcore50": { }
"net451": {},
"dotnet5.4": {}
}
}

5
src/Microsoft.Net.Http.Headers/project.json
View File

@ -9,9 +9,8 @@
"warningsAsErrors": true
},
"frameworks": {
"net45" : { },
"dnx451" : { },
"dnxcore50" : {
"net451": {},
"dotnet5.4": {
"dependencies": {
"System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Contracts": "4.0.1-beta-*",