Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 0219aab

Browse files
pranavkmpranavkm
committed
Switching to using generations TFM
1 parent 9d7300c commit 0219aab

File tree

16 files changed

+233
-241
lines changed

16 files changed

+233
-241
lines changed

‎src/Microsoft.AspNet.Html.Abstractions/project.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
{
2-
"version": "1.0.0-*",
3-
"description": "ASP.NET 5 HTML content interface.",
4-
"repository": {
5-
"type": "git",
6-
"url": "git://github.com/aspnet/httpabstractions"
7-
},
8-
"compilationOptions": {
9-
"warningsAsErrors": true
10-
},
11-
"dependencies": {
12-
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
13-
},
14-
"frameworks": {
15-
"net45" : { },
16-
"dnx451": { },
17-
"dnxcore50": {
18-
"dependencies": {
19-
"System.Resources.ResourceManager": "4.0.1-beta-*"
20-
}
21-
}
2+
"version": "1.0.0-*",
3+
"description": "ASP.NET 5 HTML content interface.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/httpabstractions"
7+
},
8+
"compilationOptions": {
9+
"warningsAsErrors": true
10+
},
11+
"dependencies": {
12+
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
13+
},
14+
"frameworks": {
15+
"net451": {},
16+
"dotnet5.4": {
17+
"dependencies": {
18+
"System.Resources.ResourceManager": "4.0.1-beta-*"
19+
}
2220
}
21+
}
2322
}

‎src/Microsoft.AspNet.Http.Abstractions/project.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
},
1111
"dependencies": {
1212
"Microsoft.AspNet.Http.Features": "1.0.0-*",
13-
"Microsoft.Extensions.ActivatorUtilities.Sources": { "type": "build", "version": "1.0.0-*" },
13+
"Microsoft.Extensions.ActivatorUtilities.Sources": {
14+
"type": "build",
15+
"version": "1.0.0-*"
16+
},
1417
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
1518
},
1619
"frameworks": {
17-
"dnx451": { },
18-
"dnxcore50": {
20+
"net451": {},
21+
"dotnet5.4": {
1922
"dependencies": {
2023
"System.Collections": "4.0.11-beta-*",
2124
"System.Diagnostics.Tools": "4.0.1-beta-*",
@@ -35,4 +38,4 @@
3538
}
3639
}
3740
}
38-
}
41+
}

‎src/Microsoft.AspNet.Http.Extensions/project.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"type": "git",
66
"url": "git://github.com/aspnet/httpabstractions"
77
},
8-
"compilationOptions": {
9-
"warningsAsErrors": true
10-
},
11-
"dependencies": {
8+
"compilationOptions": {
9+
"warningsAsErrors": true
10+
},
11+
"dependencies": {
1212
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
1313
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*",
1414
"Microsoft.Net.Http.Headers": "1.0.0-*"
1515
},
1616
"frameworks": {
17-
"dnx451": { },
18-
"dnxcore50": {
17+
"net451": {},
18+
"dotnet5.4": {
1919
"dependencies": {
2020
"System.IO.FileSystem": "4.0.1-beta-*",
2121
"System.Runtime": "4.0.21-beta-*",
2222
"System.Resources.ResourceManager": "4.0.1-beta-*"
2323
}
2424
}
2525
}
26-
}
26+
}

‎src/Microsoft.AspNet.Http.Features/project.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"version": "1.0.0-*",
3-
"description": "ASP.NET 5 HTTP feature interface definitions.",
4-
"repository": {
5-
"type": "git",
6-
"url": "git://github.com/aspnet/httpabstractions"
7-
},
8-
"compilationOptions": {
9-
"warningsAsErrors": true
10-
},
11-
"dependencies": {
12-
"Microsoft.Extensions.Primitives": "1.0.0-*"
13-
},
14-
"frameworks": {
15-
"dnx451": { },
16-
"dnxcore50": {
17-
"dependencies": {
18-
"System.Collections": "4.0.11-beta-*",
19-
"System.Linq": "4.0.1-beta-*",
20-
"System.Net.Primitives": "4.0.11-beta-*",
21-
"System.Net.WebSockets": "4.0.0-beta-*",
22-
"System.Runtime.Extensions": "4.0.11-beta-*",
23-
"System.Security.Claims": "4.0.1-beta-*",
24-
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
25-
"System.Security.Principal": "4.0.1-beta-*"
26-
}
27-
}
2+
"version": "1.0.0-*",
3+
"description": "ASP.NET 5 HTTP feature interface definitions.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/httpabstractions"
7+
},
8+
"compilationOptions": {
9+
"warningsAsErrors": true
10+
},
11+
"dependencies": {
12+
"Microsoft.Extensions.Primitives": "1.0.0-*"
13+
},
14+
"frameworks": {
15+
"net451": {},
16+
"dotnet5.4": {
17+
"dependencies": {
18+
"System.Collections": "4.0.11-beta-*",
19+
"System.Linq": "4.0.1-beta-*",
20+
"System.Net.Primitives": "4.0.11-beta-*",
21+
"System.Net.WebSockets": "4.0.0-beta-*",
22+
"System.Runtime.Extensions": "4.0.11-beta-*",
23+
"System.Security.Claims": "4.0.1-beta-*",
24+
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
25+
"System.Security.Principal": "4.0.1-beta-*"
26+
}
2827
}
29-
}
28+
}
29+
}

‎src/Microsoft.AspNet.Http/HttpContextAccessor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
#if DNX451
5+
#if NET451
66
using System.Runtime.Remoting.Messaging;
77
using System.Runtime.Remoting;
8-
#elif DNXCORE50
8+
#elif DOTNET5_4
99
using System.Threading;
1010
#endif
1111

1212
namespace Microsoft.AspNet.Http.Internal
1313
{
1414
public class HttpContextAccessor : IHttpContextAccessor
1515
{
16-
#if DNX451
16+
#if NET451
1717
private const string LogicalDataKey = "__HttpContext_Current__";
1818

1919
public HttpContext HttpContext
@@ -29,7 +29,7 @@ public HttpContext HttpContext
2929
}
3030
}
3131

32-
#elif DNXCORE50
32+
#elif DOTNET5_4
3333
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
3434
public HttpContext HttpContext
3535
{

‎src/Microsoft.AspNet.Http/ReferenceReadStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
115115
_position += read;
116116
return read;
117117
}
118-
#if DNX451
118+
#if NET451
119119
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
120120
{
121121
ThrowIfDisposed();
@@ -164,7 +164,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
164164
{
165165
throw new NotSupportedException();
166166
}
167-
#if DNX451
167+
#if NET451
168168
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
169169
{
170170
throw new NotSupportedException();

‎src/Microsoft.AspNet.Http/project.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"version": "1.0.0-*",
3-
"description": "ASP.NET 5 HTTP feature implementations.",
4-
"repository": {
5-
"type": "git",
6-
"url": "git://github.com/aspnet/httpabstractions"
7-
},
8-
"compilationOptions": {
9-
"warningsAsErrors": true,
10-
"allowUnsafe": true
11-
},
12-
"dependencies": {
13-
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
14-
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
15-
"Microsoft.Net.Http.Headers": "1.0.0-*"
16-
},
17-
"frameworks": {
18-
"dnx451": { },
19-
"dnxcore50": {
20-
"dependencies": {
21-
"System.Diagnostics.Debug": "4.0.11-beta-*",
22-
"System.Text.Encoding": "4.0.11-beta-*"
23-
}
24-
}
2+
"version": "1.0.0-*",
3+
"description": "ASP.NET 5 HTTP feature implementations.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/httpabstractions"
7+
},
8+
"compilationOptions": {
9+
"warningsAsErrors": true,
10+
"allowUnsafe": true
11+
},
12+
"dependencies": {
13+
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
14+
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
15+
"Microsoft.Net.Http.Headers": "1.0.0-*"
16+
},
17+
"frameworks": {
18+
"net451": {},
19+
"dotnet5.4": {
20+
"dependencies": {
21+
"System.Diagnostics.Debug": "4.0.11-beta-*",
22+
"System.Text.Encoding": "4.0.11-beta-*"
23+
}
2524
}
26-
}
25+
}
26+
}

‎src/Microsoft.AspNet.Owin/project.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"version": "1.0.0-*",
3-
"description": "ASP.NET 5 component for running OWIN middleware.",
4-
"repository": {
5-
"type": "git",
6-
"url": "git://github.com/aspnet/httpabstractions"
7-
},
8-
"compilationOptions": {
9-
"warningsAsErrors": true
10-
},
11-
"dependencies": {
12-
"Microsoft.AspNet.Http": "1.0.0-*"
13-
},
14-
"frameworks": {
15-
"dnx451": { },
16-
"dnxcore50": {
17-
"dependencies": {
18-
"System.Collections": "4.0.11-beta-*",
19-
"System.ComponentModel": "4.0.1-beta-*",
20-
"System.Diagnostics.Tools": "4.0.1-beta-*",
21-
"System.Globalization": "4.0.11-beta-*",
22-
"System.IO": "4.0.11-beta-*",
23-
"System.Linq": "4.0.1-beta-*",
24-
"System.Net.Primitives": "4.0.11-beta-*",
25-
"System.Runtime": "4.0.21-beta-*",
26-
"System.Runtime.Extensions": "4.0.11-beta-*",
27-
"System.Runtime.InteropServices": "4.0.21-beta-*",
28-
"System.Security.Claims": "4.0.1-beta-*",
29-
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
30-
"System.Security.Principal": "4.0.1-beta-*",
31-
"System.Threading.Tasks": "4.0.11-beta-*"
32-
}
33-
}
2+
"version": "1.0.0-*",
3+
"description": "ASP.NET 5 component for running OWIN middleware.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/httpabstractions"
7+
},
8+
"compilationOptions": {
9+
"warningsAsErrors": true
10+
},
11+
"dependencies": {
12+
"Microsoft.AspNet.Http": "1.0.0-*"
13+
},
14+
"frameworks": {
15+
"net451": {},
16+
"dotnet5.4": {
17+
"dependencies": {
18+
"System.Collections": "4.0.11-beta-*",
19+
"System.ComponentModel": "4.0.1-beta-*",
20+
"System.Diagnostics.Tools": "4.0.1-beta-*",
21+
"System.Globalization": "4.0.11-beta-*",
22+
"System.IO": "4.0.11-beta-*",
23+
"System.Linq": "4.0.1-beta-*",
24+
"System.Net.Primitives": "4.0.11-beta-*",
25+
"System.Runtime": "4.0.21-beta-*",
26+
"System.Runtime.Extensions": "4.0.11-beta-*",
27+
"System.Runtime.InteropServices": "4.0.21-beta-*",
28+
"System.Security.Claims": "4.0.1-beta-*",
29+
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
30+
"System.Security.Principal": "4.0.1-beta-*",
31+
"System.Threading.Tasks": "4.0.11-beta-*"
32+
}
3433
}
35-
}
34+
}
35+
}

‎src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public override void Write(byte[] buffer, int offset, int count)
149149
{
150150
_inner.Write(buffer, offset, count);
151151
}
152-
#if DNX451
152+
#if NET451
153153
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
154154
{
155155
return _inner.BeginWrite(buffer, offset, count, callback, state);
@@ -198,7 +198,7 @@ public async override Task<int> ReadAsync(byte[] buffer, int offset, int count,
198198

199199
return await _inner.ReadAsync(buffer, offset, count, cancellationToken);
200200
}
201-
#if DNX451
201+
#if NET451
202202
// We only anticipate using ReadAsync
203203
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
204204
{

‎src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public override int Read(byte[] buffer, int offset, int count)
163163

164164
return read;
165165
}
166-
#if DNX451
166+
#if NET451
167167
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
168168
{
169169
ThrowIfDisposed();
@@ -239,7 +239,7 @@ public override void Write(byte[] buffer, int offset, int count)
239239
{
240240
throw new NotSupportedException();
241241
}
242-
#if DNX451
242+
#if NET451
243243
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
244244
{
245245
throw new NotSupportedException();

‎src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public override void Write(byte[] buffer, int offset, int count)
119119
{
120120
throw new NotSupportedException();
121121
}
122-
#if DNX451
122+
#if NET451
123123
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
124124
{
125125
throw new NotSupportedException();
@@ -157,7 +157,7 @@ private int UpdatePosition(int read)
157157
}
158158
return read;
159159
}
160-
#if DNX451
160+
#if NET451
161161
public override IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
162162
{
163163
var tcs = new TaskCompletionSource<int>(state);

0 commit comments

Comments
 (0)