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

Commit eb0fe6a

Browse files
TratcherTratcher
committed
#281 Reorganise files, namespaces for internal and features.
1 parent 550b225 commit eb0fe6a

File tree

83 files changed

+118
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+118
-102
lines changed

‎src/Microsoft.AspNet.Http/Infrastructure/FeatureReference.cs renamed to ‎src/Microsoft.AspNet.FeatureModel/FeatureReference.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using Microsoft.AspNet.FeatureModel;
5-
6-
namespace Microsoft.AspNet.Http.Infrastructure
4+
namespace Microsoft.AspNet.FeatureModel
75
{
8-
internal struct FeatureReference<T>
6+
public struct FeatureReference<T>
97
{
108
private T _feature;
119
private int _revision;

‎src/Microsoft.AspNet.Http.Abstractions/HttpResponseWritingExtensions.cs renamed to ‎src/Microsoft.AspNet.Http.Abstractions/Extensions/HttpResponseWritingExtensions.cs

File renamed without changes.

‎src/Microsoft.AspNet.Http.Abstractions/IFormCollection.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.Collections.Generic;
5-
64
namespace Microsoft.AspNet.Http
75
{
86
/// <summary>

‎src/Microsoft.AspNet.Http.Extensions/SendFileResponseExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Microsoft.AspNet.Http.Extensions;
8+
using Microsoft.AspNet.Http.Features;
89
using Microsoft.Framework.Internal;
910

1011
namespace Microsoft.AspNet.Http

‎src/Microsoft.AspNet.Http.Features/Authentication/AuthenticateContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Security.Claims;
66
using Microsoft.Framework.Internal;
77

8-
namespace Microsoft.AspNet.Http.Authentication
8+
namespace Microsoft.AspNet.Http.Features.Authentication
99
{
1010
public class AuthenticateContext
1111
{

‎src/Microsoft.AspNet.Http.Features/Authentication/ChallengeContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66

7-
namespace Microsoft.AspNet.Http.Authentication
7+
namespace Microsoft.AspNet.Http.Features.Authentication
88
{
99
public class ChallengeContext
1010
{

‎src/Microsoft.AspNet.Http.Features/Authentication/DescribeSchemesContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Collections.Generic;
55

6-
namespace Microsoft.AspNet.Http.Authentication
6+
namespace Microsoft.AspNet.Http.Features.Authentication
77
{
88
public class DescribeSchemesContext
99
{

‎src/Microsoft.AspNet.Http.Features/Authentication/IAuthenticationHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Threading.Tasks;
55

6-
namespace Microsoft.AspNet.Http.Authentication
6+
namespace Microsoft.AspNet.Http.Features.Authentication
77
{
88
public interface IAuthenticationHandler
99
{

‎src/Microsoft.AspNet.Http.Features/Authentication/IHttpAuthenticationFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Security.Claims;
55

6-
namespace Microsoft.AspNet.Http.Authentication
6+
namespace Microsoft.AspNet.Http.Features.Authentication
77
{
88
public interface IHttpAuthenticationFeature
99
{

‎src/Microsoft.AspNet.Http.Features/Authentication/SignInContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Security.Claims;
77
using Microsoft.Framework.Internal;
88

9-
namespace Microsoft.AspNet.Http.Authentication
9+
namespace Microsoft.AspNet.Http.Features.Authentication
1010
{
1111
public class SignInContext
1212
{

‎src/Microsoft.AspNet.Http.Features/Authentication/SignOutContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using Microsoft.Framework.Internal;
77

8-
namespace Microsoft.AspNet.Http.Authentication
8+
namespace Microsoft.AspNet.Http.Features.Authentication
99
{
1010
public class SignOutContext
1111
{

‎src/Microsoft.AspNet.Http.Features/IHttpBufferingFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http
4+
namespace Microsoft.AspNet.Http.Features
55
{
66
public interface IHttpBufferingFeature
77
{

‎src/Microsoft.AspNet.Http.Features/IHttpConnectionFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Net;
55

6-
namespace Microsoft.AspNet.Http
6+
namespace Microsoft.AspNet.Http.Features
77
{
88
public interface IHttpConnectionFeature
99
{

‎src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.IO;
66

7-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features
88
{
99
public interface IHttpRequestFeature
1010
{

‎src/Microsoft.AspNet.Http.Features/IHttpRequestLifetimeFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Threading;
55

6-
namespace Microsoft.AspNet.Http
6+
namespace Microsoft.AspNet.Http.Features
77
{
88
public interface IHttpRequestLifetimeFeature
99
{

‎src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.IO;
77

8-
namespace Microsoft.AspNet.Http
8+
namespace Microsoft.AspNet.Http.Features
99
{
1010
public interface IHttpResponseFeature
1111
{

‎src/Microsoft.AspNet.Http.Features/IHttpSendFileFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Threading;
55
using System.Threading.Tasks;
66

7-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features
88
{
99
public interface IHttpSendFileFeature
1010
{

‎src/Microsoft.AspNet.Http.Features/IHttpUpgradeFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.IO;
55
using System.Threading.Tasks;
66

7-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features
88
{
99
public interface IHttpUpgradeFeature
1010
{

‎src/Microsoft.AspNet.Http.Features/IHttpWebSocketFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Net.WebSockets;
55
using System.Threading.Tasks;
66

7-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features
88
{
99
public interface IHttpWebSocketFeature
1010
{

‎src/Microsoft.AspNet.Http.Features/IRequestIdentifierFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55

6-
namespace Microsoft.AspNet.Http
6+
namespace Microsoft.AspNet.Http.Features
77
{
88
/// <summary>
99
/// Feature to identify a request.

‎src/Microsoft.AspNet.Http.Features/ISession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66

7-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features
88
{
99
public interface ISession
1010
{

‎src/Microsoft.AspNet.Http.Features/ISessionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http
4+
namespace Microsoft.AspNet.Http.Features
55
{
66
public interface ISessionFactory
77
{

‎src/Microsoft.AspNet.Http.Features/ISessionFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http
4+
namespace Microsoft.AspNet.Http.Features
55
{
66
// TODO: Is there any reason not to flatten the Factory down into the Feature?
77
public interface ISessionFeature

‎src/Microsoft.AspNet.Http.Features/ITlsConnectionFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77

8-
namespace Microsoft.AspNet.Http
8+
namespace Microsoft.AspNet.Http.Features
99
{
1010
public interface ITlsConnectionFeature
1111
{

‎src/Microsoft.AspNet.Http.Features/ITlsTokenBindingFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http
4+
namespace Microsoft.AspNet.Http.Features
55
{
66
/// <summary>
77
/// Provides information regarding TLS token binding parameters.

‎src/Microsoft.AspNet.Http.Features/WebSocketAcceptContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http
4+
namespace Microsoft.AspNet.Http.Features
55
{
66
public class WebSocketAcceptContext
77
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using System.Collections.Generic;
66
using System.Linq;
77
using System.Threading.Tasks;
8-
using Microsoft.AspNet.Http.Infrastructure;
8+
using Microsoft.AspNet.Http.Internal;
99

10-
namespace Microsoft.AspNet.Builder
10+
namespace Microsoft.AspNet.Builder.Internal
1111
{
1212
public class ApplicationBuilder : IApplicationBuilder
1313
{

‎src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
using System.Security.Claims;
88
using System.Threading.Tasks;
99
using Microsoft.AspNet.FeatureModel;
10-
using Microsoft.AspNet.Http.Infrastructure;
10+
using Microsoft.AspNet.Http.Features;
11+
using Microsoft.AspNet.Http.Features.Authentication;
12+
using Microsoft.AspNet.Http.Features.Authentication.Internal;
1113
using Microsoft.Framework.Internal;
1214

13-
namespace Microsoft.AspNet.Http.Authentication
15+
namespace Microsoft.AspNet.Http.Authentication.Internal
1416
{
1517
public class DefaultAuthenticationManager : AuthenticationManager
1618
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.AspNet.WebUtilities;
77
using Microsoft.Framework.Internal;
88

9-
namespace Microsoft.AspNet.Http
9+
namespace Microsoft.AspNet.Http.Internal
1010
{
1111
public static class BufferingHelper
1212
{

‎src/Microsoft.AspNet.Http/Infrastructure/Constants.cs renamed to ‎src/Microsoft.AspNet.Http/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace Microsoft.AspNet.Http.Infrastructure
4+
namespace Microsoft.AspNet.Http.Internal
55
{
66
internal static class Constants
77
{

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88
using Microsoft.AspNet.FeatureModel;
9-
using Microsoft.AspNet.Http.Infrastructure;
9+
using Microsoft.AspNet.Http.Features;
10+
using Microsoft.AspNet.Http.Features.Internal;
1011

11-
namespace Microsoft.AspNet.Http
12+
namespace Microsoft.AspNet.Http.Internal
1213
{
1314
public class DefaultConnectionInfo : ConnectionInfo
1415
{

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
using System.Threading;
88
using Microsoft.AspNet.FeatureModel;
99
using Microsoft.AspNet.Http.Authentication;
10-
using Microsoft.AspNet.Http.Collections;
11-
using Microsoft.AspNet.Http.Infrastructure;
10+
using Microsoft.AspNet.Http.Authentication.Internal;
11+
using Microsoft.AspNet.Http.Features;
12+
using Microsoft.AspNet.Http.Features.Authentication;
13+
using Microsoft.AspNet.Http.Features.Authentication.Internal;
14+
using Microsoft.AspNet.Http.Features.Internal;
1215

13-
namespace Microsoft.AspNet.Http
16+
namespace Microsoft.AspNet.Http.Internal
1417
{
1518
public class DefaultHttpContext : HttpContext
1619
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88
using Microsoft.AspNet.FeatureModel;
9-
using Microsoft.AspNet.Http.Collections;
10-
using Microsoft.AspNet.Http.Infrastructure;
9+
using Microsoft.AspNet.Http.Features;
10+
using Microsoft.AspNet.Http.Features.Internal;
1111
using Microsoft.Net.Http.Headers;
1212

13-
namespace Microsoft.AspNet.Http
13+
namespace Microsoft.AspNet.Http.Internal
1414
{
1515
public class DefaultHttpRequest : HttpRequest
1616
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
using System;
55
using System.IO;
66
using Microsoft.AspNet.FeatureModel;
7-
using Microsoft.AspNet.Http.Collections;
8-
using Microsoft.AspNet.Http.Infrastructure;
7+
using Microsoft.AspNet.Http.Features;
8+
using Microsoft.AspNet.Http.Features.Internal;
99
using Microsoft.Net.Http.Headers;
1010

11-
namespace Microsoft.AspNet.Http
11+
namespace Microsoft.AspNet.Http.Internal
1212
{
1313
public class DefaultHttpResponse : HttpResponse
1414
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
using System.Net.WebSockets;
77
using System.Threading.Tasks;
88
using Microsoft.AspNet.FeatureModel;
9-
using Microsoft.AspNet.Http.Infrastructure;
9+
using Microsoft.AspNet.Http.Features;
1010
using Microsoft.Net.Http.Headers;
1111

12-
namespace Microsoft.AspNet.Http
12+
namespace Microsoft.AspNet.Http.Internal
1313
{
1414
public class DefaultWebSocketManager : WebSocketManager
1515
{

‎src/Microsoft.AspNet.Http/Authentication/HttpAuthenticationFeature.cs renamed to ‎src/Microsoft.AspNet.Http/Features/Authentication/HttpAuthenticationFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Security.Claims;
55

6-
namespace Microsoft.AspNet.Http.Authentication
6+
namespace Microsoft.AspNet.Http.Features.Authentication.Internal
77
{
88
public class HttpAuthenticationFeature : IHttpAuthenticationFeature
99
{

‎src/Microsoft.AspNet.Http/FormFeature.cs renamed to ‎src/Microsoft.AspNet.Http/Features/FormFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
using System.Text;
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.AspNet.Http.Collections;
10+
using Microsoft.AspNet.Http.Internal;
1111
using Microsoft.AspNet.WebUtilities;
1212
using Microsoft.Framework.Internal;
1313
using Microsoft.Net.Http.Headers;
1414

15-
namespace Microsoft.AspNet.Http
15+
namespace Microsoft.AspNet.Http.Features.Internal
1616
{
1717
public class FormFeature : IFormFeature
1818
{

‎src/Microsoft.AspNet.Http/FormFile.cs renamed to ‎src/Microsoft.AspNet.Http/Features/FormFile.cs

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

44
using System.IO;
5+
using Microsoft.AspNet.Http.Internal;
56

6-
namespace Microsoft.AspNet.Http
7+
namespace Microsoft.AspNet.Http.Features.Internal
78
{
89
public class FormFile : IFormFile
910
{

‎src/Microsoft.AspNet.Http/HttpConnectionFeature.cs renamed to ‎src/Microsoft.AspNet.Http/Features/HttpConnectionFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Net;
55

6-
namespace Microsoft.AspNet.Http
6+
namespace Microsoft.AspNet.Http.Features.Internal
77
{
88
public class HttpConnectionFeature : IHttpConnectionFeature
99
{

‎src/Microsoft.AspNet.Http/HttpRequestFeature.cs renamed to ‎src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.IO;
77

8-
namespace Microsoft.AspNet.Http
8+
namespace Microsoft.AspNet.Http.Features.Internal
99
{
1010
public class HttpRequestFeature : IHttpRequestFeature
1111
{

0 commit comments

Comments
 (0)