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

React to HttpAbstractions change: No features in .Internal namespace #703

Merged
merged 1 commit into from
Mar 21, 2016
Merged

React to HttpAbstractions change: No features in .Internal namespace #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
using System;
using System.Collections.Generic;

namespace Microsoft.AspNetCore.Server.Kestrel.Http
namespace Microsoft.AspNetCore.Server.Kestrel.Http
{
public partial class Frame
{
private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature);
private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature);
private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature);
private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature);
private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature);
private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature);
private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature);
private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);
private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature);
private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature);
private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature);
Expand Down Expand Up @@ -75,7 +75,7 @@ private object FastFeatureGet(Type key)
{
return _currentIHttpRequestIdentifierFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
{
return _currentIServiceProvidersFeature;
}
Expand All @@ -91,23 +91,23 @@ private object FastFeatureGet(Type key)
{
return _currentIHttpAuthenticationFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
{
return _currentIQueryFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
{
return _currentIFormFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature))
{
return _currentIHttpUpgradeFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
{
return _currentIResponseCookiesFeature;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
{
return _currentIItemsFeature;
}
Expand Down Expand Up @@ -149,7 +149,7 @@ private void FastFeatureSet(Type key, object feature)
_currentIHttpRequestIdentifierFeature = feature;
return;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
{
_currentIServiceProvidersFeature = feature;
return;
Expand All @@ -169,12 +169,12 @@ private void FastFeatureSet(Type key, object feature)
_currentIHttpAuthenticationFeature = feature;
return;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
{
_currentIQueryFeature = feature;
return;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
{
_currentIFormFeature = feature;
return;
Expand All @@ -184,12 +184,12 @@ private void FastFeatureSet(Type key, object feature)
_currentIHttpUpgradeFeature = feature;
return;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
{
_currentIResponseCookiesFeature = feature;
return;
}
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
{
_currentIItemsFeature = feature;
return;
Expand Down Expand Up @@ -233,7 +233,7 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
}
if (_currentIServiceProvidersFeature != null)
{
yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
}
if (_currentIHttpRequestLifetimeFeature != null)
{
Expand All @@ -249,23 +249,23 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
}
if (_currentIQueryFeature != null)
{
yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
}
if (_currentIFormFeature != null)
{
yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.IFormFeature);
}
if (_currentIHttpUpgradeFeature != null)
{
yield return new KeyValuePair<Type, object>(IHttpUpgradeFeatureType, _currentIHttpUpgradeFeature as global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);
}
if (_currentIResponseCookiesFeature != null)
{
yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
}
if (_currentIItemsFeature != null)
{
yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
}
if (_currentITlsConnectionFeature != null)
{
Expand Down
3 changes: 1 addition & 2 deletions tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Features.Internal;
using Microsoft.AspNetCore.Http.Features.Authentication;

namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode
Expand Down Expand Up @@ -67,7 +66,7 @@ public static string GeneratedFile()
using System;
using System.Collections.Generic;

namespace Microsoft.AspNetCore.Server.Kestrel.Http
namespace Microsoft.AspNetCore.Server.Kestrel.Http
{{
public partial class Frame
{{{Each(allFeatures, feature => $@"
Expand Down