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

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

@ -1,23 +1,22 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTML content interface.", "description": "ASP.NET 5 HTML content interface.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45" : { }, "net451": {},
"dnx451": { }, "dotnet5.4": {
"dnxcore50": { "dependencies": {
"dependencies": { "System.Resources.ResourceManager": "4.0.1-beta-*"
"System.Resources.ResourceManager": "4.0.1-beta-*" }
}
}
} }
}
} }

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

@ -10,12 +10,15 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http.Features": "1.0.0-*", "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-*" "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*", "System.Diagnostics.Tools": "4.0.1-beta-*",

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

@ -5,17 +5,17 @@
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*", "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*", "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*",
"Microsoft.Net.Http.Headers": "1.0.0-*" "Microsoft.Net.Http.Headers": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.IO.FileSystem": "4.0.1-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*", "System.Runtime": "4.0.21-beta-*",

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

@ -1,29 +1,29 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP feature interface definitions.", "description": "ASP.NET 5 HTTP feature interface definitions.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.Extensions.Primitives": "1.0.0-*" "Microsoft.Extensions.Primitives": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*", "System.Linq": "4.0.1-beta-*",
"System.Net.Primitives": "4.0.11-beta-*", "System.Net.Primitives": "4.0.11-beta-*",
"System.Net.WebSockets": "4.0.0-beta-*", "System.Net.WebSockets": "4.0.0-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*", "System.Runtime.Extensions": "4.0.11-beta-*",
"System.Security.Claims": "4.0.1-beta-*", "System.Security.Claims": "4.0.1-beta-*",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
"System.Security.Principal": "4.0.1-beta-*" "System.Security.Principal": "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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
#if DNX451 #if NET451
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
using System.Runtime.Remoting; using System.Runtime.Remoting;
#elif DNXCORE50 #elif DOTNET5_4
using System.Threading; using System.Threading;
#endif #endif
@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal
{ {
public class HttpContextAccessor : IHttpContextAccessor public class HttpContextAccessor : IHttpContextAccessor
{ {
#if DNX451 #if NET451
private const string LogicalDataKey = "__HttpContext_Current__"; private const string LogicalDataKey = "__HttpContext_Current__";
public HttpContext HttpContext public HttpContext HttpContext
@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Http.Internal
} }
} }
#elif DNXCORE50 #elif DOTNET5_4
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>(); private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
public HttpContext HttpContext public HttpContext HttpContext
{ {

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

@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Http.Internal
_position += read; _position += read;
return read; return read;
} }
#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)
{ {
ThrowIfDisposed(); ThrowIfDisposed();
@ -164,7 +164,7 @@ namespace Microsoft.AspNet.Http.Internal
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
#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)
{ {
throw new NotSupportedException(); throw new NotSupportedException();

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

@ -1,26 +1,26 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP feature implementations.", "description": "ASP.NET 5 HTTP feature implementations.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"allowUnsafe": true "allowUnsafe": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*", "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Net.Http.Headers": "1.0.0-*" "Microsoft.Net.Http.Headers": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Diagnostics.Debug": "4.0.11-beta-*", "System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Text.Encoding": "4.0.11-beta-*" "System.Text.Encoding": "4.0.11-beta-*"
} }
}
} }
}
} }

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

@ -1,35 +1,35 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 component for running OWIN middleware.", "description": "ASP.NET 5 component for running OWIN middleware.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http": "1.0.0-*" "Microsoft.AspNet.Http": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.ComponentModel": "4.0.1-beta-*", "System.ComponentModel": "4.0.1-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*", "System.Diagnostics.Tools": "4.0.1-beta-*",
"System.Globalization": "4.0.11-beta-*", "System.Globalization": "4.0.11-beta-*",
"System.IO": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*", "System.Linq": "4.0.1-beta-*",
"System.Net.Primitives": "4.0.11-beta-*", "System.Net.Primitives": "4.0.11-beta-*",
"System.Runtime": "4.0.21-beta-*", "System.Runtime": "4.0.21-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*", "System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.InteropServices": "4.0.21-beta-*", "System.Runtime.InteropServices": "4.0.21-beta-*",
"System.Security.Claims": "4.0.1-beta-*", "System.Security.Claims": "4.0.1-beta-*",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*", "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
"System.Security.Principal": "4.0.1-beta-*", "System.Security.Principal": "4.0.1-beta-*",
"System.Threading.Tasks": "4.0.11-beta-*" "System.Threading.Tasks": "4.0.11-beta-*"
} }
}
} }
}
} }

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

@ -149,7 +149,7 @@ namespace Microsoft.AspNet.WebUtilities
{ {
_inner.Write(buffer, offset, count); _inner.Write(buffer, offset, count);
} }
#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 _inner.BeginWrite(buffer, offset, count, callback, 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); return await _inner.ReadAsync(buffer, offset, count, cancellationToken);
} }
#if DNX451 #if NET451
// We only anticipate using ReadAsync // We only anticipate using ReadAsync
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)
{ {

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

@ -163,7 +163,7 @@ namespace Microsoft.AspNet.WebUtilities
return read; return read;
} }
#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)
{ {
ThrowIfDisposed(); ThrowIfDisposed();
@ -239,7 +239,7 @@ namespace Microsoft.AspNet.WebUtilities
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
#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)
{ {
throw new NotSupportedException(); throw new NotSupportedException();

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

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

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

@ -1,28 +1,28 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 common helper methods.", "description": "ASP.NET 5 common helper methods.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.Extensions.Primitives": "1.0.0-*", "Microsoft.Extensions.Primitives": "1.0.0-*",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*", "System.Diagnostics.Debug": "4.0.11-beta-*",
"System.IO": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.IO.FileSystem": "4.0.1-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*", "System.Runtime": "4.0.21-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*" "System.Runtime.Extensions": "4.0.11-beta-*"
} }
}
} }
}
} }

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

@ -1,21 +1,14 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"shared": "*.cs", "shared": "*.cs",
"dependencies": { }, "dependencies": {},
"frameworks" : { "frameworks": {
"net45": { }, "net451": {},
"dnx451": { }, "dotnet5.4": {
"dnxcore50": { "dependencies": {
"dependencies": { "System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Resources.ResourceManager": "4.0.1-beta-*", "System.Runtime": "4.0.21-beta-*"
"System.Runtime": "4.0.21-beta-*" }
}
},
"dotnet": {
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-*"
}
}
} }
}
} }

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

@ -1,27 +1,26 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Contains core encoders for HTML, JavaScript strings, and URLs.", "description": "Contains core encoders for HTML, JavaScript strings, and URLs.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"allowUnsafe": true, "allowUnsafe": true,
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
"net45": { }, "net451": {},
"dnx451": { }, "dotnet5.4": {
"dnxcore50": { "dependencies": {
"dependencies": { "System.ComponentModel": "4.0.1-beta-*",
"System.ComponentModel": "4.0.1-beta-*", "System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Diagnostics.Debug": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.IO": "4.0.11-beta-*", "System.Reflection": "4.0.10-*",
"System.Reflection": "4.0.10-*", "System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Resources.ResourceManager": "4.0.1-beta-*", "System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.Extensions": "4.0.11-beta-*", "System.Threading": "4.0.11-beta-*"
"System.Threading": "4.0.11-beta-*" }
}
}
} }
}
} }

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

@ -1,21 +1,20 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Contains registration and configuration APIs for the core framework encoders.", "description": "Contains registration and configuration APIs for the core framework encoders.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
"Microsoft.Extensions.OptionsModel": "1.0.0-*", "Microsoft.Extensions.OptionsModel": "1.0.0-*",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { }, "net451": {},
"dnx451": { }, "dotnet5.4": {}
"dnxcore50": { } }
}
} }

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

@ -1,26 +1,25 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP header implementations.", "description": "ASP.NET 5 HTTP header implementations.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/httpabstractions" "url": "git://github.com/aspnet/httpabstractions"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks" : { "frameworks": {
"net45" : { }, "net451": {},
"dnx451" : { }, "dotnet5.4": {
"dnxcore50" : { "dependencies": {
"dependencies": { "System.Collections": "4.0.11-beta-*",
"System.Collections": "4.0.11-beta-*", "System.Diagnostics.Contracts": "4.0.1-beta-*",
"System.Diagnostics.Contracts": "4.0.1-beta-*", "System.Globalization": "4.0.11-beta-*",
"System.Globalization": "4.0.11-beta-*", "System.Globalization.Extensions": "4.0.1-beta-*",
"System.Globalization.Extensions": "4.0.1-beta-*", "System.Linq": "4.0.1-beta-*",
"System.Linq": "4.0.1-beta-*", "System.Text.Encoding": "4.0.11-beta-*",
"System.Text.Encoding": "4.0.11-beta-*", "System.Runtime": "4.0.21-beta-*"
"System.Runtime": "4.0.21-beta-*" }
}
}
} }
}
} }