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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:50:39 -07:00
parent 9988d5205e
commit 0ad48b90b2
21 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.FeatureModel/project.json
View File

@ -1,11 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP feature infrastructure.", "description": "ASP.NET 5 HTTP feature infrastructure.",
"dependencies": { "dependencies": {
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.Linq": "4.0.0-beta-*", "System.Linq": "4.0.0-beta-*",

6
src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs
View File

@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Http.Core
_position += read; _position += read;
return read; return read;
} }
#if ASPNET50 #if DNX451
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();
@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Http.Core
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
#if ASPNET50 #if DNX451
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();
@ -196,4 +196,4 @@ namespace Microsoft.AspNet.Http.Core
} }
} }
} }
} }

6
src/Microsoft.AspNet.Http.Core/project.json
View File

@ -1,4 +1,4 @@

{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP feature implementations.", "description": "ASP.NET 5 HTTP feature implementations.",
@ -11,8 +11,8 @@
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.Net.WebSocketAbstractions": "1.0.0-*", "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",

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

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.", "description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.",
"dependencies": { "dependencies": {
@ -7,9 +7,9 @@
"Microsoft.Net.Http.Headers": "1.0.0-*" "Microsoft.Net.Http.Headers": "1.0.0-*"
}, },
"frameworks" : { "frameworks" : {
"aspnet50" : { "dnx451" : {
}, },
"aspnetcore50" : { "dnxcore50" : {
"dependencies": { "dependencies": {
"System.Reflection.TypeExtensions": "4.0.0-beta-*", "System.Reflection.TypeExtensions": "4.0.0-beta-*",
"System.Runtime": "4.0.20-beta-*" "System.Runtime": "4.0.20-beta-*"

6
src/Microsoft.AspNet.Http.Interfaces/project.json
View File

@ -1,9 +1,9 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP feature interface definitions.", "description": "ASP.NET 5 HTTP feature interface definitions.",
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.Net.WebSocketAbstractions": "1.0.0-*", "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
"System.Net.Primitives": "4.0.10-beta-*", "System.Net.Primitives": "4.0.10-beta-*",

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

@ -1,10 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 HTTP object model. HttpContext and family.", "description": "ASP.NET 5 HTTP object model. HttpContext and family.",
"dependencies": {}, "dependencies": {},
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.Net.WebSocketAbstractions": "1.0.0-*", "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",

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

@ -1,4 +1,4 @@
{ {
"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.",
"dependencies": { "dependencies": {
@ -7,8 +7,8 @@
"Microsoft.AspNet.Http.Core": "1.0.0-*" "Microsoft.AspNet.Http.Core": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.ComponentModel": "4.0.0-beta-*", "System.ComponentModel": "4.0.0-beta-*",

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

@ -144,7 +144,7 @@ namespace Microsoft.AspNet.WebUtilities
{ {
_inner.Write(buffer, offset, count); _inner.Write(buffer, offset, count);
} }
#if ASPNET50 #if DNX451
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);
@ -193,7 +193,7 @@ namespace Microsoft.AspNet.WebUtilities
return await _inner.ReadAsync(buffer, offset, count, cancellationToken); return await _inner.ReadAsync(buffer, offset, count, cancellationToken);
} }
#if ASPNET50 #if DNX451
// 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)
{ {

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

@ -123,7 +123,7 @@ namespace Microsoft.AspNet.WebUtilities
return read; return read;
} }
#if ASPNET50 #if DNX451
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();
@ -199,7 +199,7 @@ namespace Microsoft.AspNet.WebUtilities
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
#if ASPNET50 #if DNX451
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();
@ -245,4 +245,4 @@ namespace Microsoft.AspNet.WebUtilities
} }
} }
} }
} }

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

@ -109,7 +109,7 @@ namespace Microsoft.AspNet.WebUtilities
{ {
throw new NotSupportedException(); throw new NotSupportedException();
} }
#if ASPNET50 #if DNX451
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();
@ -147,7 +147,7 @@ namespace Microsoft.AspNet.WebUtilities
} }
return read; return read;
} }
#if ASPNET50 #if DNX451
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);
@ -317,4 +317,4 @@ namespace Microsoft.AspNet.WebUtilities
return matchCount > 0; return matchCount > 0;
} }
} }
} }

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

@ -1,11 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 common helper methods.", "description": "ASP.NET 5 common helper methods.",
"dependencies": { "dependencies": {
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.Diagnostics.Debug": "4.0.10-beta-*", "System.Diagnostics.Debug": "4.0.10-beta-*",

6
src/Microsoft.Framework.WebEncoders/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Contains encoders for HTML, JavaScript, and URLs.", "description": "Contains encoders for HTML, JavaScript, and URLs.",
"compilationOptions": { "compilationOptions": {
@ -11,8 +11,8 @@
}, },
"frameworks": { "frameworks": {
"net45": { }, "net45": { },
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Diagnostics.Debug": "4.0.10-beta-*", "System.Diagnostics.Debug": "4.0.10-beta-*",
"System.IO": "4.0.10-beta-*", "System.IO": "4.0.10-beta-*",

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

@ -4,8 +4,8 @@
}, },
"frameworks" : { "frameworks" : {
"net45" : { }, "net45" : { },
"aspnet50" : { }, "dnx451" : { },
"aspnetcore50" : { "dnxcore50" : {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.Diagnostics.Contracts": "4.0.0-beta-*", "System.Diagnostics.Contracts": "4.0.0-beta-*",

4
test/Microsoft.AspNet.FeatureModel.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.FeatureModel": "1.0.0-*", "Microsoft.AspNet.FeatureModel": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
@ -9,7 +9,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Shouldly": "1.1.1.1" "Shouldly": "1.1.1.1"
} }

4
test/Microsoft.AspNet.Http.Core.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.FeatureModel": "1.0.0-*", "Microsoft.AspNet.FeatureModel": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
@ -10,7 +10,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
}, },

4
test/Microsoft.AspNet.Http.Extensions.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
@ -10,7 +10,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Shouldly": "1.1.1.1" "Shouldly": "1.1.1.1"
} }

4
test/Microsoft.AspNet.Http.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Http.Interfaces": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
@ -10,7 +10,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Shouldly": "1.1.1.1" "Shouldly": "1.1.1.1"
} }

4
test/Microsoft.AspNet.Owin.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.FeatureModel": "1.0.0-*", "Microsoft.AspNet.FeatureModel": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
@ -11,7 +11,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Shouldly": "1.1.1.1" "Shouldly": "1.1.1.1"
} }

6
test/Microsoft.AspNet.WebUtilities.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*",
@ -9,7 +9,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { } "dnxcore50": { }
} }
} }

4
test/Microsoft.Framework.WebEncoders.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.Framework.DependencyInjection": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*",
"Microsoft.Framework.WebEncoders": "1.0.0-*", "Microsoft.Framework.WebEncoders": "1.0.0-*",
@ -13,7 +13,7 @@
"allowUnsafe": true "allowUnsafe": true
}, },
"frameworks": { "frameworks": {
"aspnet50": { } "dnx451": { }
}, },
"resources": "..\\..\\unicode\\UnicodeData.txt" "resources": "..\\..\\unicode\\UnicodeData.txt"
} }

4
test/Microsoft.Net.Http.Headers.Tests/project.json
View File

@ -8,8 +8,8 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Diagnostics.Debug": "4.0.10-beta-*" "System.Diagnostics.Debug": "4.0.10-beta-*"
} }